summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-14 16:15:22 +0200
committerNoel Grandin <noel@peralex.com>2014-04-15 09:02:33 +0200
commitbe88947bac607013c6b7a3c923a2eccd09e50942 (patch)
tree09cdc0803437ac8c76e12c60c6644c49cb1d5dd4 /svx
parentcfddda092b0c105b5be7942a94cbbd88d55677f1 (diff)
svx: sal_Bool->bool
Change-Id: I464eba5fd5521c31868c6fc8a2137f17428d421e
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/GalleryControl.hxx2
-rw-r--r--svx/inc/dragmt3d.hxx6
-rw-r--r--svx/inc/galbrws2.hxx2
-rw-r--r--svx/inc/galobj.hxx12
-rw-r--r--svx/inc/xpolyimp.hxx12
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx14
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx66
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx6
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/accessibility/svxpixelctlaccessiblecontext.cxx18
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx24
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx16
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx22
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx18
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx6
-rw-r--r--svx/source/dialog/_bmpmask.cxx20
-rw-r--r--svx/source/dialog/_contdlg.cxx46
-rw-r--r--svx/source/dialog/contimp.hxx14
-rw-r--r--svx/source/dialog/contwnd.cxx8
-rw-r--r--svx/source/dialog/contwnd.hxx16
-rw-r--r--svx/source/dialog/dlgctrl.cxx24
-rw-r--r--svx/source/dialog/docrecovery.cxx8
-rw-r--r--svx/source/dialog/fntctrl.cxx14
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/hyperdlg.cxx8
-rw-r--r--svx/source/dialog/imapdlg.cxx14
-rw-r--r--svx/source/dialog/imapimp.hxx2
-rw-r--r--svx/source/dialog/imapwnd.cxx38
-rw-r--r--svx/source/dialog/imapwnd.hxx18
-rw-r--r--svx/source/dialog/measctrl.cxx2
-rw-r--r--svx/source/dialog/pagectrl.cxx6
-rw-r--r--svx/source/dialog/rubydialog.cxx8
-rw-r--r--svx/source/dialog/rulritem.cxx8
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx8
-rw-r--r--svx/source/dialog/svxruler.cxx56
-rw-r--r--svx/source/dialog/swframeexample.cxx4
-rw-r--r--svx/source/dialog/txencbox.cxx20
-rw-r--r--svx/source/engine3d/dragmt3d.cxx6
-rw-r--r--svx/source/engine3d/float3d.cxx32
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx10
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx6
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx68
-rw-r--r--svx/source/fmcomp/fmgridif.cxx40
-rw-r--r--svx/source/fmcomp/gridcell.cxx178
-rw-r--r--svx/source/fmcomp/gridctrl.cxx46
-rw-r--r--svx/source/form/ParseContext.cxx4
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx38
-rw-r--r--svx/source/form/datanavi.cxx28
-rw-r--r--svx/source/form/dbtoolsclient.cxx4
-rw-r--r--svx/source/form/filtnav.cxx56
-rw-r--r--svx/source/form/fmPropBrw.cxx12
-rw-r--r--svx/source/form/fmdpage.cxx2
-rw-r--r--svx/source/form/fmexch.cxx18
-rw-r--r--svx/source/form/fmexpl.cxx34
-rw-r--r--svx/source/form/fmmodel.cxx14
-rw-r--r--svx/source/form/fmobj.cxx12
-rw-r--r--svx/source/form/fmobjfac.cxx4
-rw-r--r--svx/source/form/fmpgeimp.cxx2
-rw-r--r--svx/source/form/fmshell.cxx42
-rw-r--r--svx/source/form/fmshimp.cxx178
-rw-r--r--svx/source/form/fmsrcimp.cxx8
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx6
-rw-r--r--svx/source/form/fmundo.cxx22
-rw-r--r--svx/source/form/fmview.cxx18
-rw-r--r--svx/source/form/fmvwimp.cxx38
-rw-r--r--svx/source/form/formcontrolfactory.cxx14
-rw-r--r--svx/source/form/formcontroller.cxx172
-rw-r--r--svx/source/form/formcontrolling.cxx16
-rw-r--r--svx/source/form/formdispatchinterceptor.cxx6
-rw-r--r--svx/source/form/formfeaturedispatcher.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx196
-rw-r--r--svx/source/form/navigatortreemodel.cxx56
-rw-r--r--svx/source/form/sdbdatacolumn.cxx6
-rw-r--r--svx/source/form/tabwin.cxx4
-rw-r--r--svx/source/form/tbxform.cxx2
-rw-r--r--svx/source/gallery2/GalleryControl.cxx4
-rw-r--r--svx/source/gallery2/codec.cxx12
-rw-r--r--svx/source/gallery2/codec.hxx2
-rw-r--r--svx/source/gallery2/galbrws1.cxx22
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx30
-rw-r--r--svx/source/gallery2/galexpl.cxx2
-rw-r--r--svx/source/gallery2/gallery1.cxx2
-rw-r--r--svx/source/gallery2/galmisc.cxx2
-rw-r--r--svx/source/gallery2/galobj.cxx24
-rw-r--r--svx/source/gallery2/galtheme.cxx24
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx8
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/docrecovery.hxx4
-rw-r--r--svx/source/inc/filtnav.hxx10
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmexch.hxx28
-rw-r--r--svx/source/inc/fmexpl.hxx82
-rw-r--r--svx/source/inc/fmpgeimp.hxx6
-rw-r--r--svx/source/inc/fmshimp.hxx72
-rw-r--r--svx/source/inc/fmundo.hxx6
-rw-r--r--svx/source/inc/fmvwimp.hxx8
-rw-r--r--svx/source/inc/formcontroller.hxx44
-rw-r--r--svx/source/inc/formcontrolling.hxx10
-rw-r--r--svx/source/inc/formdispatchinterceptor.hxx2
-rw-r--r--svx/source/inc/formfeaturedispatcher.hxx4
-rw-r--r--svx/source/inc/gridcell.hxx128
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx12
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx26
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx16
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/unogalthemeprovider.hxx2
-rw-r--r--svx/source/items/numinf.cxx4
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/items/viewlayoutitem.cxx8
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgroup.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx6
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/textproperties.cxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/nbdtmg.cxx16
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx4
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx2
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx10
-rw-r--r--svx/source/svdraw/svdcrtv.cxx8
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdedtv.cxx12
-rw-r--r--svx/source/svdraw/svdetc.cxx6
-rw-r--r--svx/source/svdraw/svdibrow.cxx4
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx6
-rw-r--r--svx/source/svdraw/svdomeas.cxx4
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/svdraw/svdotxat.cxx4
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/table/accessibletableshape.cxx8
-rw-r--r--svx/source/table/cell.cxx22
-rw-r--r--svx/source/table/cell.hxx6
-rw-r--r--svx/source/table/cellcursor.cxx17
-rw-r--r--svx/source/table/cellcursor.hxx1
-rw-r--r--svx/source/table/tablecolumn.cxx12
-rw-r--r--svx/source/table/tablecolumn.hxx6
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/table/tablelayouter.cxx4
-rw-r--r--svx/source/table/tablemodel.cxx4
-rw-r--r--svx/source/table/tablemodel.hxx2
-rw-r--r--svx/source/table/tablerow.cxx12
-rw-r--r--svx/source/table/tablerow.hxx6
-rw-r--r--svx/source/table/tableundo.hxx14
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx12
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx18
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx12
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx4
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx2
-rw-r--r--svx/source/toolbars/extrusionbar.cxx20
-rw-r--r--svx/source/toolbars/fontworkbar.cxx8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx6
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx10
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx24
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx10
-rw-r--r--svx/source/unodraw/recoveryui.cxx6
-rw-r--r--svx/source/unodraw/unoshap2.cxx10
-rw-r--r--svx/source/unodraw/unoshap3.cxx6
-rw-r--r--svx/source/unodraw/unoshap4.cxx10
-rw-r--r--svx/source/unodraw/unoshape.cxx22
-rw-r--r--svx/source/unodraw/unoshtxt.cxx18
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx4
-rw-r--r--svx/source/xml/xmleohlp.cxx6
-rw-r--r--svx/source/xml/xmlexport.cxx6
-rw-r--r--svx/source/xml/xmlgrhlp.cxx14
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx2
-rw-r--r--svx/source/xoutdev/_xpoly.cxx12
177 files changed, 1536 insertions, 1554 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 2393c658dfa5..eb21fcdeea46 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -44,7 +44,7 @@ public:
Window* pParentWindow);
virtual ~GalleryControl (void);
- sal_Bool GalleryKeyInput( const KeyEvent& rKEvt, Window* pWindow);
+ bool GalleryKeyInput( const KeyEvent& rKEvt, Window* pWindow);
private:
Gallery* mpGallery;
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index e224f6ee5100..70f3fda79236 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -77,7 +77,7 @@ public:
SdrDragView &rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- sal_Bool bFull = sal_False);
+ bool bFull = false);
virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE;
virtual bool BeginSdrDrag() SAL_OVERRIDE;
@@ -108,7 +108,7 @@ public:
SdrDragView &rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- sal_Bool bFull = sal_False);
+ bool bFull = false);
virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
@@ -133,7 +133,7 @@ public:
const SdrMarkList& rMark,
SdrHdlKind eDrgHdl = HDL_MOVE,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- sal_Bool bFull = sal_False);
+ bool bFull = false);
virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE;
virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 4036a1892785..56dbb31ad909 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -172,7 +172,7 @@ public:
void StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
- sal_Bool KeyInput( const KeyEvent& rEvt, Window* pWindow );
+ bool KeyInput( const KeyEvent& rEvt, Window* pWindow );
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; }
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 79110b3ddd7e..6b960e0986c7 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -62,13 +62,13 @@ protected:
INetURLObject aURL;
OUString aUserName;
OUString aTitle;
- sal_Bool bIsValid;
- sal_Bool bIsThumbBmp;
+ bool bIsValid;
+ bool bIsThumbBmp;
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const;
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
- sal_Bool CreateThumb( const Graphic& rGraphic );
+ bool CreateThumb( const Graphic& rGraphic );
public:
SgaObject();
@@ -80,8 +80,8 @@ public:
virtual BitmapEx GetThumbBmp() const { return aThumbBmp; }
const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; }
const INetURLObject& GetURL() const { return aURL; }
- sal_Bool IsValid() const { return bIsValid; }
- sal_Bool IsThumbBitmap() const { return bIsThumbBmp; }
+ bool IsValid() const { return bIsValid; }
+ bool IsThumbBitmap() const { return bIsThumbBmp; }
const OUString GetTitle() const;
void SetTitle( const OUString& rTitle );
@@ -122,7 +122,7 @@ class SgaObjectSvDraw : public SgaObject
private:
- sal_Bool CreateThumb( const FmFormModel& rModel );
+ bool CreateThumb( const FmFormModel& rModel );
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE;
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE;
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index 3ed0b106e14a..2b9bc67c13fe 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -28,10 +28,10 @@ class Point;
class ImpXPolygon
{
public:
- Point* pPointAry;
- sal_uInt8* pFlagAry;
- Point* pOldPointAry;
- sal_Bool bDeleteOldPoints;
+ Point* pPointAry;
+ sal_uInt8* pFlagAry;
+ Point* pOldPointAry;
+ bool bDeleteOldPoints;
sal_uInt16 nSize;
sal_uInt16 nResize;
sal_uInt16 nPoints;
@@ -49,11 +49,11 @@ public:
if ( bDeleteOldPoints )
{
delete[] (char*)pOldPointAry;
- bDeleteOldPoints = sal_False;
+ bDeleteOldPoints = false;
}
}
- void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True );
+ void Resize( sal_uInt16 nNewSize, bool bDeletePoints = true );
void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount );
void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
};
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index b2dba0231ec8..78ef214bb8c9 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -421,29 +421,29 @@ AwtSize AccFrameSelector::getSize( ) throw (RuntimeException, std::exception)
-sal_Bool AccFrameSelector::isShowing( ) throw (RuntimeException)
+bool AccFrameSelector::isShowing( ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
IsValid();
- return sal_True;
+ return true;
}
-sal_Bool AccFrameSelector::isVisible( ) throw (RuntimeException)
+bool AccFrameSelector::isVisible( ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
IsValid();
- return sal_True;
+ return true;
}
-sal_Bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException)
+bool AccFrameSelector::isFocusTraversable( ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
IsValid();
- return sal_True;
+ return true;
}
@@ -588,7 +588,7 @@ void AccFrameSelector::IsValid() throw (RuntimeException)
throw RuntimeException();
}
-void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
+void AccFrameSelector::NotifyFocusListeners(bool bGetFocus)
{
SolarMutexGuard aGuard;
AwtFocusEvent aEvent;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 83135fb1938f..2bb3d41e21ab 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -147,7 +147,7 @@ namespace accessibility
void SetAdditionalChildStates( const VectorOfStates& rChildStates );
- sal_Bool IsSelected() const;
+ bool IsSelected() const;
void Dispose();
@@ -155,10 +155,10 @@ namespace accessibility
void FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue = uno::Any(), const uno::Any& rOldValue = uno::Any() ) const;
void FireEvent( const AccessibleEventObject& rEvent ) const;
- void SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
- sal_Bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
- void SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
- void SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ void SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
+ void SetChildFocus( sal_Int32 nChild, bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ void SetShapeFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
void ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException));
#ifdef DBG_UTIL
@@ -198,10 +198,10 @@ namespace accessibility
// lock solar mutex before
SvxViewForwarder& GetViewForwarder() const SAL_THROW((uno::RuntimeException));
// lock solar mutex before
- SvxEditViewForwarder& GetEditViewForwarder( sal_Bool bCreate = sal_False ) const SAL_THROW((uno::RuntimeException));
+ SvxEditViewForwarder& GetEditViewForwarder( bool bCreate = false ) const SAL_THROW((uno::RuntimeException));
// are we in edit mode?
- sal_Bool IsActive() const SAL_THROW((uno::RuntimeException));
+ bool IsActive() const SAL_THROW((uno::RuntimeException));
// our frontend class (the one implementing the actual
// interface). That's not necessarily the one containing the impl
@@ -235,10 +235,10 @@ namespace accessibility
bool mbInNotify;
// whether the object or its children has the focus set (guarded by solar mutex)
- sal_Bool mbGroupHasFocus;
+ bool mbGroupHasFocus;
// whether we (this object) has the focus set (guarded by solar mutex)
- sal_Bool mbThisHasFocus;
+ bool mbThisHasFocus;
mutable ::osl::Mutex maMutex;
@@ -263,8 +263,8 @@ namespace accessibility
mnStartIndex( 0 ),
maEventOpenFrames( 0 ),
mbInNotify( false ),
- mbGroupHasFocus( sal_False ),
- mbThisHasFocus( sal_False ),
+ mbGroupHasFocus( false ),
+ mbThisHasFocus( false ),
maOffset(0,0),
// well, that's strictly exception safe, though not really
// robust. We rely on the fact that this member is constructed
@@ -327,7 +327,7 @@ namespace accessibility
throw uno::RuntimeException("View forwarder is invalid, model might be dead", mxFrontEnd);
}
- SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
+ SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( bool bCreate ) const SAL_THROW((uno::RuntimeException))
{
if( !maEditSource.IsValid() )
@@ -363,10 +363,10 @@ namespace accessibility
throw uno::RuntimeException("AccessibleTextHelper_Impl::GetEditSource: no edit source", mxFrontEnd );
}
- sal_Bool AccessibleTextHelper_Impl::IsSelected() const
+ bool AccessibleTextHelper_Impl::IsSelected() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
@@ -414,13 +414,13 @@ namespace accessibility
maParaManager.SetAdditionalChildStates( rChildStates );
}
- void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+ void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
if( bHaveFocus )
{
if( mbThisHasFocus )
- SetShapeFocus( sal_False );
+ SetShapeFocus( false );
maParaManager.SetFocus( nChild );
@@ -436,7 +436,7 @@ namespace accessibility
OSL_TRACE("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d lost focus", nChild );
if( mbGroupHasFocus )
- SetShapeFocus( sal_True );
+ SetShapeFocus( true );
}
}
@@ -444,18 +444,18 @@ namespace accessibility
{
if( mbThisHasFocus )
- SetShapeFocus( sal_False );
+ SetShapeFocus( false );
- mbGroupHasFocus = sal_True;
+ mbGroupHasFocus = true;
maParaManager.SetFocus( nNewChild );
OSL_TRACE("AccessibleTextHelper_Impl::ChangeChildFocus(): Paragraph %d received focus", nNewChild );
}
- void AccessibleTextHelper_Impl::SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+ void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- sal_Bool bOldFocus( mbThisHasFocus );
+ bool bOldFocus( mbThisHasFocus );
mbThisHasFocus = bHaveFocus;
@@ -498,10 +498,10 @@ namespace accessibility
}
}
- void AccessibleTextHelper_Impl::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+ void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
- sal_Bool bOldFocus( mbGroupHasFocus );
+ bool bOldFocus( mbGroupHasFocus );
mbGroupHasFocus = bHaveFocus;
@@ -524,7 +524,7 @@ namespace accessibility
OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused");
}
- sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
+ bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
{
// No locking of solar mutex here, since we rely on the fact
@@ -532,7 +532,7 @@ namespace accessibility
return mbThisHasFocus;
}
- sal_Bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
+ bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
{
try
@@ -541,7 +541,7 @@ namespace accessibility
SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
if( !pViewForwarder )
- return sal_False;
+ return false;
if( mxFrontEnd.is() )
{
@@ -554,13 +554,13 @@ namespace accessibility
}
}
if( pViewForwarder->IsValid() )
- return sal_True;
+ return true;
else
- return sal_False;
+ return false;
}
catch( const uno::RuntimeException& )
{
- return sal_False;
+ return false;
}
}
@@ -838,7 +838,7 @@ namespace accessibility
}
Rectangle aTmpBB, aParaBB;
- sal_Bool bFirstChild = sal_True;
+ bool bFirstChild = true;
sal_Int32 nCurrPara;
sal_Int32 nParas=rCacheTF.GetParagraphCount();
@@ -857,7 +857,7 @@ namespace accessibility
// at least partially visible
if( bFirstChild )
{
- bFirstChild = sal_False;
+ bFirstChild = false;
mnFirstVisibleChild = nCurrPara;
}
@@ -1359,7 +1359,7 @@ namespace accessibility
maParaManager.SetActive();
// per definition, edit mode text has the focus
- SetFocus( sal_True );
+ SetFocus( true );
break;
}
@@ -1368,7 +1368,7 @@ namespace accessibility
// focused child now looses focus
ESelection aSelection;
if( GetEditViewForwarder().GetSelection( aSelection ) )
- SetChildFocus( aSelection.nEndPara, sal_False );
+ SetChildFocus( aSelection.nEndPara, false );
// change children state
maParaManager.SetActive( false );
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 048db6dcd78a..abadd5b3fbe0 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -920,7 +920,7 @@ void ChildrenManagerImpl::UpdateSelection (void)
VEC_SHAPE vecSelect;
int nAddSelect=0;
int nRemoveSelect=0;
- sal_Bool bHasSelectedShape=sal_False;
+ bool bHasSelectedShape=false;
ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
@@ -972,7 +972,7 @@ void ChildrenManagerImpl::UpdateSelection (void)
}
else
{//Selected not change,has selected shape before
- bHasSelectedShape=sal_True;
+ bHasSelectedShape=true;
}
}
else
@@ -1045,7 +1045,7 @@ void ChildrenManagerImpl::UpdateSelection (void)
}
if (nAddSelect > 1 )//check other selected shape fire selection add event
{
- bHasSelectedShape=sal_True;
+ bHasSelectedShape=true;
}
}
}
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index ef06ecdc32a1..74ffcab8b5f9 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -78,7 +78,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
mpPage (NULL),
mpView (NULL),
mnClientId( 0 ),
- mbDisposed( sal_False )
+ mbDisposed( false )
{
if (mpControl != NULL)
{
@@ -754,7 +754,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
if( mbDisposed )
return;
- mbDisposed = sal_True;
+ mbDisposed = true;
mpControl = NULL; // object dies with representation
mpView = NULL;
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index b624283cacff..76dd605b4fa6 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -329,7 +329,7 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde
throw lang::IndexOutOfBoundsException();
long nIndex = mrPixelCtl.ShowPosition(mrPixelCtl.IndexToPoint(nChildIndex));
- NotifyChild(nIndex,sal_True,sal_False);
+ NotifyChild(nIndex,true,false);
}
sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
@@ -436,7 +436,7 @@ void SAL_CALL SvxPixelCtlAccessible::disposing()
}
}
-void SvxPixelCtlAccessible::NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool bCheck)
+void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck)
{
DBG_ASSERT( !(!bSelect && !bCheck),"" );//non is false
@@ -450,11 +450,11 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool b
{
if (bSelect)
{
- pChild->SelectChild(sal_True);
+ pChild->SelectChild(true);
}
if (bCheck)
{
- pChild->ChangePixelColorOrBG(sal_Bool(mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex))));
+ pChild->ChangePixelColorOrBG( mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)) != 0);
pChild->CheckChild();
}
return ;
@@ -474,9 +474,9 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool b
{
if (pChild)
{
- pChild->SelectChild(sal_False);
+ pChild->SelectChild(false);
}
- pNewChild->SelectChild(sal_True);
+ pNewChild->SelectChild(true);
}
if (bCheck)
{
@@ -496,7 +496,7 @@ uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Poin
nX = (sal_uInt16) mrPixelCtl.GetWidth() - 1 - nX;
}
- sal_Bool bPixelColorOrBG= sal_Bool(mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)));
+ bool bPixelColorOrBG = mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)) != 0;
Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount());
uno::Reference<XAccessible> xChild;
xChild = new SvxPixelCtlAccessibleChild(mrPixelCtl,
@@ -534,7 +534,7 @@ void SvxPixelCtlAccessibleChild::CheckChild()
}
}
-void SvxPixelCtlAccessibleChild::SelectChild( sal_Bool bSelect)
+void SvxPixelCtlAccessibleChild::SelectChild( bool bSelect)
{
Any aSelected;
aSelected <<= AccessibleStateType::SELECTED;
@@ -563,7 +563,7 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent (
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
- sal_Bool bPixelColorOrBG,
+ bool bPixelColorOrBG,
const Point &aPoint,
const Rectangle& rBoundingBox,
const uno::Reference<XAccessible>& rxParent,
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 56ac207ada69..f0c8b226ac4d 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -240,12 +240,12 @@ awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeExceptio
return AWTSize( GetBoundingBox().GetSize() );
}
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isShowing() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlAccessibleContext::isShowing() throw( RuntimeException )
{
- return sal_True;
+ return true;
}
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -254,9 +254,9 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeExcepti
return mpRepr->IsVisible();
}
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isFocusTraversable() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlAccessibleContext::isFocusTraversable() throw( RuntimeException )
{
- return sal_True;
+ return true;
}
//===== XAccessibleContext ==================================================
@@ -659,7 +659,7 @@ void SvxRectCtlAccessibleContext::FireChildFocus( RECT_POINT eButton )
else
mnSelectedChild = NOCHILDSELECTED;
}
-void SvxRectCtlAccessibleContext::selectChild( long nNew, sal_Bool bFireFocus )
+void SvxRectCtlAccessibleContext::selectChild( long nNew, bool bFireFocus )
{
::osl::MutexGuard aGuard( m_aMutex );
if( nNew != mnSelectedChild )
@@ -690,7 +690,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew, sal_Bool bFireFocus )
}
}
-void SvxRectCtlAccessibleContext::selectChild(RECT_POINT eButton, sal_Bool bFireFocus )
+void SvxRectCtlAccessibleContext::selectChild(RECT_POINT eButton, bool bFireFocus )
{
// no guard -> is done in next selectChild
selectChild(PointToIndex( eButton, mbAngleMode ), bFireFocus);
@@ -847,12 +847,12 @@ awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeExc
return AWTSize( GetBoundingBox().GetSize() );
}
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isShowing() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlChildAccessibleContext::isShowing() throw( RuntimeException )
{
- return sal_True;
+ return true;
}
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isVisible() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlChildAccessibleContext::isVisible() throw( RuntimeException )
{
::osl::MutexGuard aGuard( maMutex );
@@ -861,9 +861,9 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isVisible() throw( RuntimeEx
return mxParent.is()? ( static_cast< SvxRectCtlAccessibleContext* >( mxParent.get() ) )->isVisible() : sal_False;
}
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlChildAccessibleContext::isFocusTraversable() throw( RuntimeException )
{
- return sal_False;
+ return false;
}
void SAL_CALL SvxRectCtlChildAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& /*xListener*/ )
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 299cc4c39433..26d4156d34c0 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -466,7 +466,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
}
else if ( rPropVal.Name == sMirroredX )
{
- sal_Bool bMirroredX = sal_Bool();
+ bool bMirroredX;
if ( rPropVal.Value >>= bMirroredX )
{
if ( bMirroredX )
@@ -475,7 +475,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
}
else if ( rPropVal.Name == sMirroredY )
{
- sal_Bool bMirroredY = sal_Bool();
+ bool bMirroredY;
if ( rPropVal.Value >>= bMirroredY )
{
if ( bMirroredY )
@@ -484,7 +484,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
}
else if ( rPropVal.Name == sSwitched )
{
- sal_Bool bSwitched = sal_Bool();
+ bool bSwitched;
if ( rPropVal.Value >>= bSwitched )
{
if ( bSwitched )
@@ -1411,7 +1411,7 @@ void EnhancedCustomShape2d::SwapStartAndEndArrow( SdrObject* pObj ) //#108274
pObj->SetMergedItem( aLineEndCenter );
}
-static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, const sal_Bool bClockwise, sal_Bool bFullCircle = sal_False )
+static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, const bool bClockwise, bool bFullCircle = false )
{
Rectangle aRect( rRect );
Point aStart( rStart );
@@ -1683,7 +1683,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
double fy1 = ( -sin( fStartAngle * F_PI180 ) * 65536.0 * fYScale ) + fCenterY;
double fx2 = ( cos( fEndAngle * F_PI180 ) * 65536.0 * fXScale ) + fCenterX;
double fy2 = ( -sin( fEndAngle * F_PI180 ) * 65536.0 * fYScale ) + fCenterY;
- aNewB2DPolygon.append(CreateArc( aRect, Point( (sal_Int32)fx1, (sal_Int32)fy1 ), Point( (sal_Int32)fx2, (sal_Int32)fy2 ), sal_False));
+ aNewB2DPolygon.append(CreateArc( aRect, Point( (sal_Int32)fx1, (sal_Int32)fy1 ), Point( (sal_Int32)fx2, (sal_Int32)fy2 ), false));
}
else
{ /* SJ: TODO: this block should be replaced sometimes, because the current point
@@ -1784,7 +1784,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
case ARCTO :
case CLOCKWISEARCTO :
{
- sal_Bool bClockwise = ( nCommand == CLOCKWISEARC ) || ( nCommand == CLOCKWISEARCTO );
+ bool bClockwise = ( nCommand == CLOCKWISEARC ) || ( nCommand == CLOCKWISEARCTO );
sal_uInt32 nXor = bClockwise ? 3 : 2;
for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( ( rSrcPt + 3 ) < nCoordSize ); i++ )
{
@@ -1825,7 +1825,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
OSL_TRACE("ARCANGLETO scale: %f x %f angles: %f, %f", fWR, fHR, fStartAngle, fSwingAngle);
- sal_Bool bClockwise = fSwingAngle >= 0.0;
+ bool bClockwise = fSwingAngle >= 0.0;
if (aNewB2DPolygon.count() > 0)
{
@@ -2219,7 +2219,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly )
sal_uInt16 nSegmentInd = 0;
std::vector< SdrPathObj* > vObjectList;
- sal_Bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType );
+ bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType );
sal_Int32 nSubPathIndex = 0;
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 1e3622f6373a..9f4c4e7fdda3 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -149,9 +149,9 @@ drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawin
return eRet;
}
-sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const sal_Bool bDefault )
+bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const bool bDefault )
{
- sal_Bool bRetValue = bDefault;
+ bool bRetValue = bDefault;
const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName );
if ( pAny )
*pAny >>= bRetValue;
@@ -283,10 +283,10 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
pMap = &fMap;
}
}
- if ( GetBool( rGeometryItem, aExtrusion, sal_False ) )
+ if ( GetBool( rGeometryItem, aExtrusion, false ) )
{
- sal_Bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX();
- sal_Bool bIsMirroredY = ((SdrObjCustomShape*)pCustomShape)->IsMirroredY();
+ bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX();
+ bool bIsMirroredY = ((SdrObjCustomShape*)pCustomShape)->IsMirroredY();
Rectangle aSnapRect( pCustomShape->GetLogicRect() );
long nObjectRotation = pCustomShape->GetRotateAngle();
if ( nObjectRotation )
@@ -341,7 +341,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) );
const OUString aExtrusionColor( "Color" );
- sal_Bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, sal_False );
+ bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, false );
XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) );
pScene->GetProperties().SetObjectItem( Svx3DShadeModeItem( 0 ) );
@@ -499,7 +499,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
else if ( bUseTwoFillStyles )
{
BitmapEx aFillBmp;
- sal_Bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue();
+ bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue();
if ( bFillBmpTile )
{
const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetMergedItem(XATTR_FILLBITMAP);
@@ -679,7 +679,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
double fLightIntensity = GetDouble( rGeometryItem, sFirstLightLevel, 43712.0 / 655.36, NULL ) / 100.0;
const OUString sFirstLightHarsh( "FirstLightHarsh" );
- /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, sal_False );
+ /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, false );
const OUString sSecondLightDirection( "SecondLightDirection" );
drawing::Direction3D aSecondLightDirectionDefault( -50000, 0, 10000 );
@@ -692,8 +692,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
const OUString sSecondLightHarsh( "SecondLightHarsh" );
const OUString sLightFace( "LightFace" );
- /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, sal_False );
- /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, sal_False );
+ /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, false );
+ /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, false );
sal_uInt16 nAmbientColor = (sal_uInt16)( fAmbientIntensity * 255.0 );
if ( nAmbientColor > 255 )
@@ -727,7 +727,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
const OUString sSpecularity( "Specularity" );
const OUString sMetal( "Metal" );
double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100;
- sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False );
+ bool bMetal = GetBool( rGeometryItem, sMetal, false );
Color aSpecularCol( 225,225,225 );
if ( bMetal )
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index da3c5df7e87e..4835d60e18ac 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -70,7 +70,7 @@ class EnhancedCustomShapeEngine : public cppu::WeakImplHelper3
>
{
css::uno::Reference< css::drawing::XShape > mxShape;
- sal_Bool mbForceGroupWithText;
+ bool mbForceGroupWithText;
SdrObject* ImplForceGroupWithText( const SdrObjCustomShape* pCustoObj, SdrObject* pRenderedShape );
@@ -106,7 +106,7 @@ public:
};
EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
- mbForceGroupWithText ( sal_False )
+ mbForceGroupWithText ( false )
{
}
EnhancedCustomShapeEngine::~EnhancedCustomShapeEngine()
@@ -281,7 +281,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
// retrieving the TextPath property to check if feature is enabled
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
- sal_Bool bTextPathOn = sal_False;
+ bool bTextPathOn = false;
const OUString sTextPath( "TextPath" );
uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
if ( pAny )
@@ -291,9 +291,9 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
bool bPostRotateAngle = aCustomShape2d.IsPostRotate();
- sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
- sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
- sal_Bool bLineGeometryNeededOnly = bTextPathOn;
+ bool bFlipV = aCustomShape2d.IsFlipVert();
+ bool bFlipH = aCustomShape2d.IsFlipHorz();
+ bool bLineGeometryNeededOnly = bTextPathOn;
SdrObject* pRenderedShape = aCustomShape2d.CreateObject( bLineGeometryNeededOnly );
if ( pRenderedShape )
@@ -310,7 +310,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
SdrObject* pRenderedShape3d = EnhancedCustomShape3d::Create3DObject( pRenderedShape, pSdrObjCustomShape );
if ( pRenderedShape3d )
{
- bFlipV = bFlipH = sal_False;
+ bFlipV = bFlipH = false;
nRotateAngle = 0;
SdrObject::Free( pRenderedShape );
pRenderedShape = pRenderedShape3d;
@@ -403,8 +403,8 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
if ( pObj )
{
Rectangle aRect( pSdrObjCustomShape->GetSnapRect() );
- sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
- sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
+ bool bFlipV = aCustomShape2d.IsFlipVert();
+ bool bFlipH = aCustomShape2d.IsFlipHorz();
const GeoStat& rGeoStat = ((SdrObjCustomShape*)pSdrObjCustomShape)->GetGeoStat();
if ( rGeoStat.nShearWink )
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index e5278e3997d8..1f5aa6a5bcd5 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -208,9 +208,9 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
rFWData.fHorizontalTextScaling = fScalingFactor;
}
-void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, FWTextArea& rTextArea, sal_Bool bSameLetterHeights )
+void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, FWTextArea& rTextArea, bool bSameLetterHeights )
{
- sal_Bool bIsVertical = ((SdrObjCustomShape*)pCustomShape)->IsVerticalWriting();
+ bool bIsVertical = ((SdrObjCustomShape*)pCustomShape)->IsVerticalWriting();
sal_Int32 nVerticalOffset = rFWData.nMaxParagraphsPerTextArea > rTextArea.vParagraphs.size()
? rFWData.nSingleLineHeight / 2 : 0;
@@ -423,7 +423,7 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
rFWData.nSingleLineHeight = (sal_Int32)( ( (double)pCustomShape->GetLogicRect().GetHeight()
/ rFWData.nMaxParagraphsPerTextArea ) * rFWData.fHorizontalTextScaling );
- sal_Bool bSameLetterHeights = sal_False;
+ bool bSameLetterHeights = false;
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
const OUString sTextPath( "TextPath" );
const OUString sSameLetterHeights( "SameLetterHeights" );
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index f876e2a06602..38af730b9ea0 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -51,7 +51,7 @@
( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) && \
( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) ) \
{ \
- aCol = pDstCols[i]; bReplace = sal_True; break; \
+ aCol = pDstCols[i]; bReplace = true; break; \
} \
} \
}
@@ -163,16 +163,16 @@ void MaskSet::onEditColor()
class MaskData
{
SvxBmpMask* pMask;
- sal_Bool bIsReady;
- sal_Bool bExecState;
+ bool bIsReady;
+ bool bExecState;
SfxBindings& rBindings;
public:
MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind );
- sal_Bool IsCbxReady() const { return bIsReady; }
- void SetExecState( sal_Bool bState ) { bExecState = bState; }
- sal_Bool IsExecReady() const { return bExecState; }
+ bool IsCbxReady() const { return bIsReady; }
+ void SetExecState( bool bState ) { bExecState = bState; }
+ bool IsExecReady() const { return bExecState; }
DECL_LINK( PipetteHdl, ToolBox* pTbx );
DECL_LINK( CbxHdl, CheckBox* pCbx );
@@ -186,8 +186,8 @@ public:
MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
pMask ( pBmpMask ),
- bIsReady ( sal_False ),
- bExecState ( sal_False ),
+ bIsReady ( false ),
+ bExecState ( false ),
rBindings ( rBind )
{
@@ -783,7 +783,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
long* pMinB = new long[nCount];
long* pMaxB = new long[nCount];
sal_uInt16 i;
- sal_Bool bReplace;
+ bool bReplace;
aMtf.SetPrefSize( rMtf.GetPrefSize() );
aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() );
@@ -813,7 +813,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
{
MetaAction* pAction = rMtf.GetAction( nAct );
- bReplace = sal_False;
+ bReplace = false;
switch( pAction->GetType() )
{
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c793ef7cb558..c81d40f5f9a3 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -217,9 +217,9 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
aContourWnd ( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ),
aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
nGrfChanged ( 0UL ),
- bExecState ( sal_False ),
- bUpdateGraphicLinked( sal_False ),
- bGraphicLinked ( sal_False ),
+ bExecState ( false ),
+ bUpdateGraphicLinked( false ),
+ bGraphicLinked ( false ),
maImageList ( SVX_RES( CD_IMAPDLG ) )
{
ApplyImageList();
@@ -302,7 +302,7 @@ void SvxSuperContourDlg::Resize()
bool SvxSuperContourDlg::Close()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
{
@@ -316,7 +316,7 @@ bool SvxSuperContourDlg::Close()
SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
else if ( nRet == RET_CANCEL )
- bRet = sal_False;
+ bRet = false;
}
return( bRet ? SfxFloatingWindow::Close() : sal_False );
@@ -324,7 +324,7 @@ bool SvxSuperContourDlg::Close()
// Enabled or disabled all Controls
-void SvxSuperContourDlg::SetExecState( sal_Bool bEnable )
+void SvxSuperContourDlg::SetExecState( bool bEnable )
{
bExecState = bEnable;
}
@@ -345,7 +345,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
const MapMode aMap100( MAP_100TH_MM );
const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
OutputDevice* pOutDev = Application::GetDefaultDevice();
- sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
{
@@ -375,7 +375,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
const MapMode aMap100( MAP_100TH_MM );
const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
OutputDevice* pOutDev = Application::GetDefaultDevice();
- sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
{
@@ -396,7 +396,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
return aRetPolyPoly;
}
-void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked,
+void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
aUpdateGraphic = rGraphic;
@@ -444,12 +444,12 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
MessageDialog aQBox( this,"QueryDeleteContourDialog","svx/ui/querydeletecontourdialog.ui");
if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) )
- aContourWnd.SetWorkplaceMode( sal_True );
+ aContourWnd.SetWorkplaceMode( true );
else
aTbx1.CheckItem( TBI_WORKPLACE, false );
}
else
- aContourWnd.SetWorkplaceMode( sal_False );
+ aContourWnd.SetWorkplaceMode( false );
}
break;
@@ -531,7 +531,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
case( TBI_PIPETTE ):
{
- sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+ bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
if ( !bPipette )
aStbStatus.Invalidate();
@@ -609,7 +609,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
aUpdateGraphic = Graphic();
aUpdatePolyPoly = PolyPolygon();
- bUpdateGraphicLinked = sal_False;
+ bUpdateGraphicLinked = false;
aContourWnd.GetSdrModel()->SetChanged( false );
}
@@ -625,7 +625,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl)
const Rectangle aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) );
const Graphic& rGraphic = aContourWnd.GetGraphic();
- const sal_Bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
+ const bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
EnterWait();
SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) );
@@ -638,12 +638,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
{
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrView* pView = pWnd->GetSdrView();
- const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
- const sal_Bool bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
- const sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
- const sal_Bool bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
- const sal_Bool bDontHide = !( bPipette || bWorkplace );
- const sal_Bool bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
+ const bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+ const bool bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
+ const bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+ const bool bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
+ const bool bDontHide = !( bPipette || bWorkplace );
+ const bool bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() );
@@ -738,7 +738,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
if( !!aMask )
{
MessageDialog aQBox( this,"QueryNewContourDialog","svx/ui/querynewcontourdialog.ui");
- sal_Bool bNewContour;
+ bool bNewContour;
aRedoGraphic = Graphic();
aUndoGraphic = aGraphic;
@@ -757,7 +757,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
}
aTbx1.CheckItem( TBI_PIPETTE, false );
- pWnd->SetPipetteMode( sal_False );
+ pWnd->SetPipetteMode( false );
aStbStatus.Invalidate();
return 0L;
@@ -767,7 +767,7 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
{
aTbx1.CheckItem( TBI_WORKPLACE, false );
aTbx1.CheckItem( TBI_SELECT, true );
- pWnd->SetWorkplaceMode( sal_False );
+ pWnd->SetWorkplaceMode( false );
return 0L;
}
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 39ad8afe73f5..2bdbd53d3a3e 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -46,9 +46,9 @@ class SvxSuperContourDlg : public SvxContourDlg
ContourWindow aContourWnd;
StatusBar aStbStatus;
sal_uIntPtr nGrfChanged;
- sal_Bool bExecState;
- sal_Bool bUpdateGraphicLinked;
- sal_Bool bGraphicLinked;
+ bool bExecState;
+ bool bUpdateGraphicLinked;
+ bool bGraphicLinked;
ImageList maImageList;
virtual void Resize() SAL_OVERRIDE;
@@ -71,12 +71,12 @@ public:
Window* pParent, const ResId& rResId );
virtual ~SvxSuperContourDlg();
- void SetExecState( sal_Bool bEnable );
+ void SetExecState( bool bEnable );
void SetGraphic( const Graphic& rGraphic );
- void SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; }
+ void SetGraphicLinked( bool bLinked ) { bGraphicLinked = bLinked; }
const Graphic& GetGraphic() const { return aGraphic; }
- sal_Bool IsGraphicChanged() const { return nGrfChanged > 0UL; }
+ bool IsGraphicChanged() const { return nGrfChanged > 0UL; }
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true );
@@ -87,7 +87,7 @@ public:
bool IsUndoPossible() const;
bool IsRedoPossible() const;
- void UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked,
+ void UpdateGraphic( const Graphic& rGraphic, bool bGraphicLinked,
const PolyPolygon* pPolyPoly = NULL,
void* pEditingObj = NULL );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 7ebde92e253b..24e9e4425f46 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -37,9 +37,9 @@
ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
GraphCtrl ( pParent, rResId ),
aWorkRect ( 0, 0, 0, 0 ),
- bPipetteMode ( sal_False ),
- bWorkplaceMode ( sal_False ),
- bClickValid ( sal_False )
+ bPipetteMode ( false ),
+ bWorkplaceMode ( false ),
+ bClickValid ( false )
{
SetWinStyle( WB_SDRMODE );
}
@@ -161,7 +161,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
void ContourWindow::MouseMove( const MouseEvent& rMEvt )
{
- bClickValid = sal_False;
+ bClickValid = false;
if ( bPipetteMode )
{
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 7bb1b6295d2b..c9839dae3299 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -31,9 +31,9 @@ class ContourWindow : public GraphCtrl
Link aPipetteLink;
Link aPipetteClickLink;
Link aWorkplaceClickLink;
- sal_Bool bPipetteMode;
- sal_Bool bWorkplaceMode;
- sal_Bool bClickValid;
+ bool bPipetteMode;
+ bool bWorkplaceMode;
+ bool bClickValid;
protected:
@@ -54,15 +54,15 @@ public:
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
const PolyPolygon& GetPolyPolygon();
- void SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; }
- sal_Bool IsPipetteMode() const { return bPipetteMode; }
+ void SetPipetteMode( const bool bPipette ) { bPipetteMode = bPipette; }
+ bool IsPipetteMode() const { return bPipetteMode; }
const Color& GetPipetteColor() const { return aPipetteColor; }
- sal_Bool IsClickValid() const { return bClickValid; }
+ bool IsClickValid() const { return bClickValid; }
bool IsContourChanged() const;
- void SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
- sal_Bool IsWorkplaceMode() const { return bWorkplaceMode; }
+ void SetWorkplaceMode( const bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
+ bool IsWorkplaceMode() const { return bWorkplaceMode; }
const Rectangle& GetWorkRect() const { return aWorkRect; }
void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 2b6e48c28987..b9006a5a572d 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -190,8 +190,8 @@ void SvxRectCtl::InitRectBitmap( void )
aColorAry2[6] = rStyles.GetDialogColor();
#ifdef DBG_UTIL
- static sal_Bool bModify = sal_False;
- sal_Bool& rModify = bModify;
+ static bool bModify = false;
+ bool& rModify = bModify;
if( rModify )
{
static int n = 0;
@@ -883,7 +883,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
if(m_pAccess)
{
- m_pAccess->NotifyChild(nIndex,sal_True, sal_True);
+ m_pAccess->NotifyChild(nIndex,true, true);
}
}
@@ -968,7 +968,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aKeyCode = rKEvt.GetKeyCode();
sal_uInt16 nCode = aKeyCode.GetCode();
- sal_Bool bIsMod = aKeyCode.IsShift() || aKeyCode.IsMod1() || aKeyCode.IsMod2();
+ bool bIsMod = aKeyCode.IsShift() || aKeyCode.IsMod1() || aKeyCode.IsMod2();
if( !bIsMod )
{
@@ -977,7 +977,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
);
Size mRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2);
Rectangle mRepaintRect( pRepaintPoint, mRepaintSize );
- sal_Bool bFocusPosChanged=sal_False;
+ bool bFocusPosChanged=false;
switch(nCode)
{
case KEY_LEFT:
@@ -985,7 +985,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
{
aFocusPosition.setX( aFocusPosition.getX() - 1 );
Invalidate(mRepaintRect);
- bFocusPosChanged=sal_True;
+ bFocusPosChanged=true;
}
break;
case KEY_RIGHT:
@@ -993,7 +993,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
{
aFocusPosition.setX( aFocusPosition.getX() + 1 );
Invalidate(mRepaintRect);
- bFocusPosChanged=sal_True;
+ bFocusPosChanged=true;
}
break;
case KEY_UP:
@@ -1001,7 +1001,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
{
aFocusPosition.setY( aFocusPosition.getY() - 1 );
Invalidate(mRepaintRect);
- bFocusPosChanged=sal_True;
+ bFocusPosChanged=true;
}
break;
case KEY_DOWN:
@@ -1009,7 +1009,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
{
aFocusPosition.setY( aFocusPosition.getY() + 1 );
Invalidate(mRepaintRect);
- bFocusPosChanged=sal_True;
+ bFocusPosChanged=true;
}
break;
case KEY_SPACE:
@@ -1031,11 +1031,11 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
case KEY_DOWN:
if (bFocusPosChanged)
{
- m_pAccess->NotifyChild(nIndex,sal_False,sal_False);
+ m_pAccess->NotifyChild(nIndex,false,false);
}
break;
case KEY_SPACE:
- m_pAccess->NotifyChild(nIndex,sal_False,sal_True);
+ m_pAccess->NotifyChild(nIndex,false,true);
break;
default:
break;
@@ -1055,7 +1055,7 @@ void SvxPixelCtl::GetFocus()
if(m_pAccess)
{
- m_pAccess->NotifyChild(GetFoucsPosIndex(),sal_True,sal_False);
+ m_pAccess->NotifyChild(GetFoucsPosIndex(),true,false);
}
Control::GetFocus();
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 63b2747a4671..44512cef7910 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1363,7 +1363,7 @@ BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent ,
, m_aCancelBtn ( this , SVX_RES( BTN_BROKEN_CANCEL ) )
, m_pCore ( pCore )
, m_bBeforeRecovery (bBeforeRecovery)
- , m_bExecutionNeeded(sal_False)
+ , m_bExecutionNeeded(false)
{
FreeResource();
@@ -1388,7 +1388,7 @@ BrokenRecoveryDialog::~BrokenRecoveryDialog()
void BrokenRecoveryDialog::impl_refresh()
{
- m_bExecutionNeeded = sal_False;
+ m_bExecutionNeeded = false;
TURLList* pURLList = m_pCore->getURLListAccess();
TURLList::const_iterator pIt;
for ( pIt = pURLList->begin();
@@ -1412,7 +1412,7 @@ void BrokenRecoveryDialog::impl_refresh()
continue;
}
- m_bExecutionNeeded = sal_True;
+ m_bExecutionNeeded = true;
sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
m_aFileListLB.SetEntryData( nPos, (void*)&rInfo );
@@ -1422,7 +1422,7 @@ void BrokenRecoveryDialog::impl_refresh()
}
-sal_Bool BrokenRecoveryDialog::isExecutionNeeded()
+bool BrokenRecoveryDialog::isExecutionNeeded()
{
return m_bExecutionNeeded;
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 37b41ca06983..6e9ca6e176fe 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1052,7 +1052,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet,
if( GetWhich( rSet, SID_ATTR_CHAR_CONTOUR, nWhich ) )
{
const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich );
- sal_Bool bOutline = rItem.GetValue();
+ bool bOutline = rItem.GetValue();
rFont.SetOutline( bOutline );
rCJKFont.SetOutline( bOutline );
rCTLFont.SetOutline( bOutline );
@@ -1062,14 +1062,14 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet,
if( GetWhich( rSet, SID_ATTR_CHAR_SHADOWED, nWhich ) )
{
const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich );
- sal_Bool bShadow = rItem.GetValue();
+ bool bShadow = rItem.GetValue();
rFont.SetShadow( bShadow );
rCJKFont.SetShadow( bShadow );
rCTLFont.SetShadow( bShadow );
}
// Background
- sal_Bool bTransparent;
+ bool bTransparent;
if( GetWhich( rSet, bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR, nWhich ) )
{
const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich );
@@ -1297,7 +1297,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet )
if( ISITEMSET )
{
const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich );
- sal_Bool bOutline = rItem.GetValue();
+ bool bOutline = rItem.GetValue();
rFont.SetOutline( bOutline );
rCJKFont.SetOutline( bOutline );
rCTLFont.SetOutline( bOutline );
@@ -1308,14 +1308,14 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet )
if( ISITEMSET )
{
const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich );
- sal_Bool bShadow = rItem.GetValue();
+ bool bShadow = rItem.GetValue();
rFont.SetShadow( bShadow );
rCJKFont.SetShadow( bShadow );
rCTLFont.SetShadow( bShadow );
}
// Background
- sal_Bool bTransparent;
+ bool bTransparent;
nWhich = rSet.GetPool()->GetWhich( pImpl->bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR );
if( ISITEMSET )
{
@@ -1327,7 +1327,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet )
rCTLFont.SetFillColor( rColor );
}
else
- bTransparent = sal_True;
+ bTransparent = true;
rFont.SetTransparent( bTransparent );
rCJKFont.SetTransparent( bTransparent );
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 3d016f329e67..01763dd2ed66 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1217,7 +1217,7 @@ void FrameSelector::GetFocus()
mxImpl->DoInvalidate( false );
if( mxImpl->mxAccess.is() )
- mxImpl->mpAccess->NotifyFocusListeners( sal_True );
+ mxImpl->mpAccess->NotifyFocusListeners( true );
if (IsAnyBorderSelected())
{
FrameBorderType borderType = FRAMEBORDER_NONE;
@@ -1248,7 +1248,7 @@ void FrameSelector::LoseFocus()
{
mxImpl->DoInvalidate( false );
if( mxImpl->mxAccess.is() )
- mxImpl->mpAccess->NotifyFocusListeners( sal_False );
+ mxImpl->mpAccess->NotifyFocusListeners( false );
Control::LoseFocus();
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index aa8d603c2260..73ecb74bf326 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -377,7 +377,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
// select next handle
const SdrHdlList& rHdlList = pView->GetHdlList();
- sal_Bool bForward(!aCode.IsShift());
+ bool bForward(!aCode.IsShift());
((SdrHdlList&)rHdlList).TravelFocusHdl(bForward);
@@ -522,7 +522,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if(pView->IsDragObj())
{
bool bWasNoSnap = rDragStat.IsNoSnap();
- sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
+ bool bWasSnapEnabled = pView->IsSnapEnabled();
// switch snapping off
if(!bWasNoSnap)
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 8134696c61b8..95a2800c9b62 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -38,9 +38,9 @@ struct MyStruct
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
SfxChildWinFactory* pFact;
- sal_Bool bHideNotDelete;
- sal_Bool bVisible;
- sal_Bool bHideAtToggle;
+ bool bHideNotDelete;
+ bool bVisible;
+ bool bHideAtToggle;
SfxModule* pContextModule;
SfxWorkWindow* pWorkWin;
};
@@ -58,7 +58,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
DBG_ASSERT(mpDlg, "Dialogdiet fail!");
pWindow = mpDlg->GetWindow();
- ((MyStruct*)pImp)->bVisible = sal_False;
+ ((MyStruct*)pImp)->bVisible = false;
Window* pTopWindow = 0;
if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index c1307f584458..d6f2dad2f112 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -174,7 +174,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
aEdtText.Disable();
maFtTarget.Disable();
maCbbTarget.Disable();
- pOwnData->bExecState = sal_False;
+ pOwnData->bExecState = false;
Resize();
@@ -220,7 +220,7 @@ void SvxIMapDlg::Resize()
bool SvxIMapDlg::Close()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
{
@@ -234,7 +234,7 @@ bool SvxIMapDlg::Close()
SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
else if( nRet == RET_CANCEL )
- bRet = sal_False;
+ bRet = false;
}
else if( pIMapWnd->IsChanged() )
{
@@ -244,7 +244,7 @@ bool SvxIMapDlg::Close()
if( nRet == RET_YES )
bRet = DoSave();
else if( nRet == RET_CANCEL )
- bRet = sal_False;
+ bRet = false;
}
return( bRet ? SfxModelessDialog::Close() : sal_False );
@@ -513,7 +513,7 @@ bool SvxIMapDlg::DoSave()
const OUString aCERNFilter( IMAP_CERN_FILTER );
const OUString aNCSAFilter( IMAP_NCSA_FILTER );
SdrModel* pModel = pIMapWnd->GetSdrModel();
- const sal_Bool bChanged = pModel->IsChanged();
+ const bool bChanged = pModel->IsChanged();
bool bRet = false;
aDlg.AddFilter( aCERNFilter, IMAP_CERN_TYPE );
@@ -753,8 +753,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrModel* pModel = pWnd->GetSdrModel();
const SdrView* pView = pWnd->GetSdrView();
- const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
- const sal_Bool bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
+ const bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+ const bool bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() );
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 7c6bf25c3931..dfc9a64c9c1e 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -35,7 +35,7 @@ public:
ImageMap aUpdateImageMap;
TargetList aUpdateTargetList;
void* pUpdateEditingObject;
- sal_Bool bExecState;
+ bool bExecState;
IMapOwnData()
: pUpdateEditingObject(NULL)
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index da20aec4d324..b341fc1faec0 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -76,10 +76,10 @@ IMapWindow::~IMapWindow()
void IMapWindow::SetImageMap( const ImageMap& rImageMap )
{
- ReplaceImageMap( rImageMap, sal_False );
+ ReplaceImageMap( rImageMap, false );
}
-void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ )
+void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, bool /*bScaleToGraphic*/ )
{
SdrPage* pPage = 0;
aIMap = rImageMap;
@@ -116,11 +116,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleTo
}
}
-sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
+bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
{
const SdrObject* pSdrObj = GetSelectedSdrObject();
IMapObject* pIMapObj;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) )
{
@@ -128,9 +128,9 @@ sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
pIMapObj->SetAltText( rNewInfo.aMarkAltText );
pIMapObj->SetTarget( rNewInfo.aMarkTarget );
pModel->SetChanged( true );
- UpdateInfo( sal_False );
+ UpdateInfo( false );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -341,7 +341,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
OUString aDesc;
OUString aTarget;
IMapObjectPtr pIMapObj = pUserData->GetObject();
- sal_Bool bActive = sal_True;
+ bool bActive = true;
if ( pIMapObj.get() )
{
@@ -402,13 +402,13 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
{
GraphCtrl::MouseButtonUp( rMEvt );
- UpdateInfo( sal_True );
+ UpdateInfo( true );
}
void IMapWindow::MarkListHasChanged()
{
GraphCtrl::MarkListHasChanged();
- UpdateInfo( sal_False );
+ UpdateInfo( false );
}
SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
@@ -530,7 +530,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
pModel->SetChanged( true );
pView->UnmarkAll();
pView->MarkObj( pSdrObj, pView->GetSdrPageView() );
- UpdateInfo( sal_True );
+ UpdateInfo( true );
nRet = rEvt.mnAction;
}
}
@@ -568,7 +568,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
}
}
-void IMapWindow::SetCurrentObjState( sal_Bool bActive )
+void IMapWindow::SetCurrentObjState( bool bActive )
{
SdrObject* pObj = GetSelectedSdrObject();
@@ -595,7 +595,7 @@ void IMapWindow::SetCurrentObjState( sal_Bool bActive )
}
}
-void IMapWindow::UpdateInfo( sal_Bool bNewObj )
+void IMapWindow::UpdateInfo( bool bNewObj )
{
if ( aInfoLink.IsSet() )
{
@@ -606,7 +606,7 @@ void IMapWindow::UpdateInfo( sal_Bool bNewObj )
if ( pIMapObj )
{
- aInfo.bOneMarked = sal_True;
+ aInfo.bOneMarked = true;
aInfo.aMarkURL = pIMapObj->GetURL();
aInfo.aMarkAltText = pIMapObj->GetAltText();
aInfo.aMarkTarget = pIMapObj->GetTarget();
@@ -616,8 +616,8 @@ void IMapWindow::UpdateInfo( sal_Bool bNewObj )
else
{
aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = "";
- aInfo.bOneMarked = sal_False;
- aInfo.bActivated = sal_False;
+ aInfo.bOneMarked = false;
+ aInfo.bActivated = false;
}
aInfoLink.Call( this );
@@ -650,7 +650,7 @@ void IMapWindow::DoMacroAssign()
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
pModel->SetChanged( true );
- UpdateInfo( sal_False );
+ UpdateInfo( false );
}
delete pMacroDlg;
@@ -688,7 +688,7 @@ void IMapWindow::DoPropertyDialog()
pIMapObj->SetTarget( aDlg->GetTarget() );
pIMapObj->SetName( aDlg->GetName() );
pModel->SetChanged( true );
- UpdateInfo( sal_True );
+ UpdateInfo( true );
}
delete aDlg;
}
@@ -713,11 +713,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
case( MN_ACTIVATE ):
{
- const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+ const bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
pMenu->CheckItem( MN_ACTIVATE, bNewState );
SetCurrentObjState( bNewState );
- UpdateInfo( sal_False );
+ UpdateInfo( false );
}
case( MN_FRAME_TO_TOP ):
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 3b34504c48ad..3d151c61e731 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -37,9 +37,9 @@ struct NotifyInfo
OUString aMarkURL;
OUString aMarkAltText;
OUString aMarkTarget;
- sal_Bool bNewObj;
- sal_Bool bOneMarked;
- sal_Bool bActivated;
+ bool bNewObj;
+ bool bOneMarked;
+ bool bActivated;
};
@@ -47,8 +47,8 @@ struct NotifyPosSize
{
Size aPictureSize;
Point aMousePos;
- sal_Bool bPictureSize;
- sal_Bool bMousePos;
+ bool bPictureSize;
+ bool bMousePos;
};
#define SVD_IMAP_USERDATA 0x0001
@@ -119,7 +119,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
void CreateImageMap();
- void ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic );
+ void ReplaceImageMap( const ImageMap& rNewImageMap, bool bScaleToGraphic );
void ClearTargetList();
@@ -127,19 +127,19 @@ protected:
IMapObject* GetIMapObj( const SdrObject* pSdrObj ) const;
SdrObject* GetHitSdrObj( const Point& rPosPixel ) const;
- void UpdateInfo( sal_Bool bNewObj );
+ void UpdateInfo( bool bNewObj );
public:
IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
virtual ~IMapWindow();
- sal_Bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
+ bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
void SetImageMap( const ImageMap& rImageMap );
const ImageMap& GetImageMap();
- void SetCurrentObjState( sal_Bool bActive );
+ void SetCurrentObjState( bool bActive );
void DoMacroAssign();
void DoPropertyDialog();
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 6e4c1264d85c..5d2910f98145 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -103,7 +103,7 @@ void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt )
{
bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
- sal_Bool bCtrl = rMEvt.IsMod1();
+ bool bCtrl = rMEvt.IsMod1();
if( bZoomIn || bZoomOut )
{
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index fae0f2b7d8fa..c0f76c609ec9 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -35,7 +35,7 @@ struct PageWindow_Impl
Bitmap aBitmap;
bool bBitmap;
bool bResetBackground;
- sal_Bool bFrameDirection;
+ bool bFrameDirection;
sal_Int32 nFrameDirection;
@@ -43,10 +43,10 @@ struct PageWindow_Impl
pBorder(0),
bBitmap(false),
bResetBackground(false),
- bFrameDirection(sal_False),
+ bFrameDirection(false),
nFrameDirection(0) {}
- void EnableFrameDirection(sal_Bool bEnable){bFrameDirection = bEnable;}
+ void EnableFrameDirection(bool bEnable){bFrameDirection = bEnable;}
void SetFrameDirection(sal_Int32 nDirection){nFrameDirection = nDirection;}
};
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 76c521ea2829..674d5ba5ed3b 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -292,7 +292,7 @@ void SvxRubyDialog::Activate()
SfxModelessDialog::Activate();
SfxPoolItem* pState = 0;
SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState );
- sal_Bool bEnable = (eState < SFX_ITEM_AVAILABLE) || !pState || !((SfxBoolItem*)pState)->GetValue();
+ bool bEnable = (eState < SFX_ITEM_AVAILABLE) || !pState || !((SfxBoolItem*)pState)->GetValue();
delete pState;
m_pStylistPB->Enable(bEnable);
//get selection from current view frame
@@ -378,7 +378,7 @@ void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
{
OUString sLeft, sRight;
const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
- sal_Bool bEnable = aRubyValues.getLength() > nPos;
+ bool bEnable = aRubyValues.getLength() > nPos;
if(bEnable)
{
const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos];
@@ -392,7 +392,7 @@ void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
}
}
else if(!nPos)
- bEnable = sal_True;
+ bEnable = true;
rLeft.Enable(bEnable);
rRight.Enable(bEnable);
rLeft.SetText(sLeft);
@@ -457,7 +457,7 @@ void SvxRubyDialog::Update()
}
if(nPosition > -2 && pProps[nProp].Name == cRubyIsAbove )
{
- sal_Bool bTmp = *(sal_Bool*)pProps[nProp].Value.getValue();
+ bool bTmp = *(sal_Bool*)pProps[nProp].Value.getValue();
if(!nRuby)
nPosition = bTmp ? 0 : 1;
else if( (!nPosition && !bTmp) || (nPosition == 1 && bTmp) )
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 149c659f2d3b..a6bb6e8c273a 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -549,13 +549,13 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
rVal <<= nLeft;
break;
case MID_ORTHO:
- rVal <<= (sal_Bool) bOrtho;
+ rVal <<= bOrtho;
break;
case MID_ACTUAL:
rVal <<= (sal_Int32) nActColumn;
break;
case MID_TABLE:
- rVal <<= (sal_Bool) bTable;
+ rVal <<= bTable;
break;
default:
OSL_FAIL("Wrong MemberId!");
@@ -583,7 +583,7 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
break;
case MID_ORTHO:
rVal >>= nVal;
- bOrtho = (sal_Bool) nVal;
+ bOrtho = (bool) nVal;
break;
case MID_ACTUAL:
rVal >>= nVal;
@@ -591,7 +591,7 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
break;
case MID_TABLE:
rVal >>= nVal;
- bTable = (sal_Bool) nVal;
+ bTable = (bool) nVal;
break;
default:
OSL_FAIL("Wrong MemberId!");
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 03a15234fed6..4a542e20e6dd 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -92,7 +92,7 @@ static const sal_Unicode aBulletTypes[] =
static Font& lcl_GetDefaultBulletFont()
{
- static sal_Bool bInit = 0;
+ static bool bInit = false;
static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
if(!bInit)
{
@@ -101,7 +101,7 @@ static Font& lcl_GetDefaultBulletFont()
aDefBulletFont.SetPitch( PITCH_DONTKNOW );
aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
aDefBulletFont.SetTransparent( true );
- bInit = sal_True;
+ bInit = true;
}
return aDefBulletFont;
}
@@ -367,11 +367,11 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
#ifdef DBG_UTIL
catch(Exception&)
{
- static sal_Bool bAssert = sal_False;
+ static bool bAssert = false;
if(!bAssert)
{
OSL_FAIL("exception in ::UserDraw");
- bAssert = sal_True;
+ bAssert = true;
}
}
#else
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 1313e61a0aea..c11f0f1ad643 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -135,9 +135,9 @@ struct SvxRuler_Impl {
// For columns; buffered to prevent
// recalculation errors
// May be has to be widen for future values
- sal_Bool bIsTableRows : 1; // mpColumnItem contains table rows instead of columns
+ bool bIsTableRows : 1; // mpColumnItem contains table rows instead of columns
//#i24363# tab stops relative to indent
- sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
+ bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
SvxRuler_Impl() :
pPercBuf(0), pBlockBuf(0), nPercSize(0), nTotalDist(0),
@@ -145,8 +145,8 @@ struct SvxRuler_Impl {
lLastLMargin(0), lLastRMargin(0), aProtectItem(SID_RULER_PROTECT),
pTextRTLItem(0), nControlerItems(0), nIdx(0),
nColLeftPix(0), nColRightPix(0),
- bIsTableRows(sal_False),
- bIsTabsRelativeToIndent(sal_True)
+ bIsTableRows(false),
+ bIsTabsRelativeToIndent(true)
{
}
@@ -751,7 +751,7 @@ void SvxRuler::Update(
//must not delete it
{
mpColumnItem.reset();
- mpRulerImpl->bIsTableRows = sal_False;
+ mpRulerImpl->bIsTableRows = false;
}
StartListening_Impl();
}
@@ -767,7 +767,7 @@ void SvxRuler::UpdateColumns()
sal_uInt16 nStyleFlags = RULER_BORDER_VARIABLE;
- sal_Bool bProtectColumns =
+ bool bProtectColumns =
mpRulerImpl->aProtectItem.IsSizeProtected() ||
mpRulerImpl->aProtectItem.IsPosProtected();
@@ -857,7 +857,7 @@ void SvxRuler::UpdatePara()
// Dependence on PagePosItem
if(mpParaItem.get() && mpPagePosItem.get() && !mpObjectItem.get())
{
- sal_Bool bRTLText = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTLText = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
// First-line indent is negative to the left paragraph margin
long nLeftFrameMargin = GetLeftFrameMargin();
long nRightFrameMargin = GetRightFrameMargin();
@@ -1043,7 +1043,7 @@ void SvxRuler::UpdateTabs()
{
// buffer for DefaultTabStop
// Distance last Tab <-> Right paragraph margin / DefaultTabDist
- sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
long nLeftFrameMargin = GetLeftFrameMargin();
long nRightFrameMargin = GetRightFrameMargin();
@@ -1254,7 +1254,7 @@ inline long SvxRuler::GetFrameLeft() const
inline void SvxRuler::SetFrameLeft(long lFrameLeft)
{
/* Set Left margin in Pixels */
- sal_Bool bProtectColumns =
+ bool bProtectColumns =
mpRulerImpl->aProtectItem.IsSizeProtected() ||
mpRulerImpl->aProtectItem.IsPosProtected();
if(bAppSetNullOffset)
@@ -1380,7 +1380,7 @@ long SvxRuler::GetCorrectedDragPos( bool bLeft, bool bRight )
const long lNullPix = Ruler::GetNullOffset();
long lDragPos = GetDragPos() + lNullPix;
ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos))
- sal_Bool bHoriRows = bHorz && mpRulerImpl->bIsTableRows;
+ bool bHoriRows = bHorz && mpRulerImpl->bIsTableRows;
if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft)
lDragPos = nMaxLeft;
else if((bRight||bHoriRows) && lDragPos > nMaxRight)
@@ -1424,7 +1424,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset();
const long lDragPos = lInputDiff;
- sal_Bool bProtectColumns =
+ bool bProtectColumns =
mpRulerImpl->aProtectItem.IsSizeProtected() ||
mpRulerImpl->aProtectItem.IsPosProtected();
@@ -1553,7 +1553,7 @@ void SvxRuler::DragMargin2()
DragBorders();
}
- sal_Bool bProtectColumns =
+ bool bProtectColumns =
mpRulerImpl->aProtectItem.IsSizeProtected() ||
mpRulerImpl->aProtectItem.IsPosProtected();
@@ -1771,8 +1771,8 @@ void SvxRuler::UpdateParaContents_Impl(
void SvxRuler::DragBorders()
{
/* Dragging of Borders (Tables and other columns) */
- sal_Bool bLeftIndentsCorrected = sal_False;
- sal_Bool bRightIndentsCorrected = sal_False;
+ bool bLeftIndentsCorrected = false;
+ bool bRightIndentsCorrected = false;
int nIndex;
if(GetDragType() == RULER_TYPE_BORDER)
@@ -1814,13 +1814,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
if(i == GetActRightColumn())
{
UpdateParaContents_Impl(mpBorders[i].nPos - l, MOVE_RIGHT);
- bRightIndentsCorrected = sal_True;
+ bRightIndentsCorrected = true;
}
// LAR, EZE update the column
else if(i == GetActLeftColumn())
{
UpdateParaContents_Impl(mpBorders[i].nPos - l, MOVE_LEFT);
- bLeftIndentsCorrected = sal_True;
+ bLeftIndentsCorrected = true;
}
}
}
@@ -1887,13 +1887,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
if(i == GetActRightColumn())
{
UpdateParaContents_Impl(mpBorders[i].nPos - l, MOVE_RIGHT);
- bRightIndentsCorrected = sal_True;
+ bRightIndentsCorrected = true;
}
// LAR, EZE update the column
else if(i == GetActLeftColumn())
{
UpdateParaContents_Impl(mpBorders[i].nPos - l, MOVE_LEFT);
- bLeftIndentsCorrected = sal_True;
+ bLeftIndentsCorrected = true;
}
}
}
@@ -2185,7 +2185,7 @@ void SvxRuler::ApplyIndents()
void SvxRuler::ApplyTabs()
{
/* Apply tab settings, changed by dragging. */
- sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
const sal_uInt16 nCoreIdx = GetDragAryPos();
if(IsDragDelete())
{
@@ -2559,11 +2559,11 @@ void SvxRuler::Click()
pBindings->Update( SID_RULER_PROTECT );
pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL );
}
- sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
if(mpTabStopItem.get() &&
(nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
{
- sal_Bool bContentProtected = mpRulerImpl->aProtectItem.IsCntntProtected();
+ bool bContentProtected = mpRulerImpl->aProtectItem.IsCntntProtected();
if( bContentProtected ) return;
const long lPos = GetClickPos();
if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2610,7 +2610,7 @@ void SvxRuler::CalcMinMax()
Calculates the limits for dragging; which are in pixels relative to the
page edge
*/
- sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
const long lNullPix = ConvertPosPixel(lLogicNullOffset);
mpRulerImpl->lMaxLeftLogic=mpRulerImpl->lMaxRightLogic=-1;
switch(GetDragType())
@@ -3153,7 +3153,7 @@ long SvxRuler::StartDrag()
<SvxRuler::CalcMinMax()>
<SvxRuler::EndDrag()>
*/
- sal_Bool bContentProtected = mpRulerImpl->aProtectItem.IsCntntProtected();
+ bool bContentProtected = mpRulerImpl->aProtectItem.IsCntntProtected();
if(!bValid)
return sal_False;
@@ -3278,7 +3278,7 @@ void SvxRuler::EndDrag()
on the application, by calling the respective Apply...() methods to send the
data to the application.
*/
- const sal_Bool bUndo = IsDragCanceled();
+ const bool bUndo = IsDragCanceled();
const long lPos = GetDragPos();
DrawLine_Impl(lTabPos, 6, bHorz);
lTabPos = -1;
@@ -3413,7 +3413,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
if ( COMMAND_CONTEXTMENU == rCommandEvent.GetCommand() )
{
CancelDrag();
- sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
+ bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
if ( !mpTabs.empty() &&
RULER_TYPE_TAB ==
GetType( rCommandEvent.GetMousePosPixel(), &mpRulerImpl->nIdx ) &&
@@ -3448,7 +3448,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
FieldUnit eUnit = GetUnit();
const sal_uInt16 nCount = aMenu.GetItemCount();
- sal_Bool bReduceMetric = 0 != (nFlags & SVXRULER_SUPPORT_REDUCED_METRIC);
+ bool bReduceMetric = 0 != (nFlags & SVXRULER_SUPPORT_REDUCED_METRIC);
for ( sal_uInt16 i = nCount; i; --i )
{
const sal_uInt16 nId = aMenu.GetItemId(i - 1);
@@ -3490,7 +3490,7 @@ sal_uInt16 SvxRuler::GetActRightColumn(
else
nAct++; //To be able to pass on the ActDrag
- sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
+ bool bConsiderHidden = !bForceDontConsiderHidden &&
!(nDragType & DRAG_OBJECT_ACTLINE_ONLY);
while( nAct < mpColumnItem->Count() - 1 )
@@ -3512,7 +3512,7 @@ sal_uInt16 SvxRuler::GetActLeftColumn(
sal_uInt16 nLeftOffset = 1;
- sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
+ bool bConsiderHidden = !bForceDontConsiderHidden &&
!(nDragType & DRAG_OBJECT_ACTLINE_ONLY);
while(nAct >= nLeftOffset)
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 8af0931419a5..a4c746116893 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -71,7 +71,7 @@ void SvxSwFrameExample::InitColors_Impl( void )
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
m_aBgCol = Color( rSettings.GetWindowColor() );
- sal_Bool bHC = rSettings.GetHighContrastMode();
+ bool bHC = rSettings.GetHighContrastMode();
m_aFrameColor = Color( COL_LIGHTGREEN );
m_aAlignColor = Color( COL_LIGHTRED );
@@ -689,7 +689,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor);
// Frame View
- sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans;
+ bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans;
DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor );
}
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 331d90b1a422..969186c05dfb 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -89,12 +89,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
sal_uInt32 nCount = m_pEncTable->Count();
for ( sal_uInt32 j=0; j<nCount; j++ )
{
- sal_Bool bInsert = sal_True;
+ bool bInsert = true;
rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
if ( nExcludeInfoFlags )
{
if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
- bInsert = sal_False;
+ bInsert = false;
else
{
if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -102,10 +102,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
((nEnc == RTL_TEXTENCODING_UCS2) ||
nEnc == RTL_TEXTENCODING_UCS4) )
- bInsert = sal_False; // InfoFlags don't work for Unicode :-(
+ bInsert = false; // InfoFlags don't work for Unicode :-(
}
else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
- bInsert = sal_False;
+ bInsert = false;
}
}
if ( bInsert )
@@ -118,7 +118,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
case RTL_TEXTENCODING_GB_2312 :
case RTL_TEXTENCODING_GBK :
case RTL_TEXTENCODING_MS_936 :
- bInsert = sal_False;
+ bInsert = false;
break;
}
}
@@ -146,12 +146,12 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs );
for ( sal_Int32 j=0; j<nCount; j++ )
{
- sal_Bool bInsert = sal_True;
+ bool bInsert = true;
rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] );
if ( nExcludeInfoFlags )
{
if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
- bInsert = sal_False;
+ bInsert = false;
else
{
if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -159,10 +159,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
((nEnc == RTL_TEXTENCODING_UCS2) ||
nEnc == RTL_TEXTENCODING_UCS4) )
- bInsert = sal_False; // InfoFlags don't work for Unicode :-(
+ bInsert = false; // InfoFlags don't work for Unicode :-(
}
else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
- bInsert = sal_False;
+ bInsert = false;
}
}
if ( bInsert )
@@ -175,7 +175,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
case RTL_TEXTENCODING_GB_2312 :
case RTL_TEXTENCODING_GBK :
case RTL_TEXTENCODING_MS_936 :
- bInsert = sal_False;
+ bInsert = false;
break;
}
}
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 9e77190b6b64..dd410bbeb231 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -41,7 +41,7 @@ E3dDragMethod::E3dDragMethod (
SdrDragView &_rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr,
- sal_Bool bFull)
+ bool bFull)
: SdrDragMethod(_rView),
meConstraint(eConstr),
mbMoveFull(bFull),
@@ -277,7 +277,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod);
E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr,
- sal_Bool bFull)
+ bool bFull)
: E3dDragMethod(_rView, rMark, eConstr, bFull)
{
// Get center of all selected objects in eye coordinates
@@ -457,7 +457,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
const SdrMarkList& rMark,
SdrHdlKind eDrgHdl,
E3dDragConstraint eConstr,
- sal_Bool bFull)
+ bool bFull)
: E3dDragMethod(_rView, rMark, eConstr, bFull),
meWhatDragHdl(eDrgHdl)
{
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 7320727839a6..a25470bb3f9f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -600,7 +600,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
}
}
// Bitmap fill ? -> Status
- sal_Bool bBitmap(sal_False);
+ bool bBitmap(false);
eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
if(eState != SFX_ITEM_DONTCARE)
{
@@ -1786,7 +1786,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
TriState eState = aBtnDoubleSided.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = TRISTATE_TRUE == eState;
+ bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DDoubleSidedItem(bValue));
}
else
@@ -1837,7 +1837,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnNormalsInvert.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = TRISTATE_TRUE == eState;
+ bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DNormalsInvertItem(bValue));
}
else
@@ -1847,7 +1847,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnTwoSidedLighting.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = TRISTATE_TRUE == eState;
+ bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
}
else
@@ -1867,7 +1867,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnShadow3d.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = TRISTATE_TRUE == eState;
+ bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DShadow3DItem(bValue));
rAttrs.Put(SdrShadowItem(bValue));
}
@@ -1922,7 +1922,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight1.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight1 );
+ bool bValue = GetUILightState( aBtnLight1 );
rAttrs.Put(Svx3DLightOnOff1Item(bValue));
// Light 1 (direction)
@@ -1947,7 +1947,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight2.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight2 );
+ bool bValue = GetUILightState( aBtnLight2 );
rAttrs.Put(Svx3DLightOnOff2Item(bValue));
// Light 2 (direction)
@@ -1971,7 +1971,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight3.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight3 );
+ bool bValue = GetUILightState( aBtnLight3 );
rAttrs.Put(Svx3DLightOnOff3Item(bValue));
// Light 3 (direction)
@@ -1995,7 +1995,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight4.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight4 );
+ bool bValue = GetUILightState( aBtnLight4 );
rAttrs.Put(Svx3DLightOnOff4Item(bValue));
// Light 4 (direction)
@@ -2019,7 +2019,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight5.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight5 );
+ bool bValue = GetUILightState( aBtnLight5 );
rAttrs.Put(Svx3DLightOnOff5Item(bValue));
// Light 5 (direction)
@@ -2043,7 +2043,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight6.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight6 );
+ bool bValue = GetUILightState( aBtnLight6 );
rAttrs.Put(Svx3DLightOnOff6Item(bValue));
// Light 6 (direction)
@@ -2067,7 +2067,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight7.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight7 );
+ bool bValue = GetUILightState( aBtnLight7 );
rAttrs.Put(Svx3DLightOnOff7Item(bValue));
// Light 7 (direction)
@@ -2091,7 +2091,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight8.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = GetUILightState( aBtnLight8 );
+ bool bValue = GetUILightState( aBtnLight8 );
rAttrs.Put(Svx3DLightOnOff8Item(bValue));
// Light 8 (direction)
@@ -2171,7 +2171,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnTexFilter.GetState();
if( eState != TRISTATE_INDET )
{
- sal_Bool bValue = TRISTATE_TRUE == eState;
+ bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(Svx3DTextureFilterItem(bValue));
}
else
@@ -2357,7 +2357,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
if( pBtn )
{
// Since the permanent updating of the preview would be too expensive
- sal_Bool bUpdatePreview = aBtnLight.IsChecked();
+ bool bUpdatePreview = aBtnLight.IsChecked();
aBtnGeo.Check( &aBtnGeo == pBtn );
aBtnRepresentation.Check( &aBtnRepresentation == pBtn );
@@ -2701,7 +2701,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aLbLight8.Hide();
}
}
- sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn );
+ bool bEnable = GetUILightState( *(ImageButton*)pBtn );
aBtnLightColor.Enable( bEnable );
pLb->Enable( bEnable );
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 8fb1883093c4..07becc8004f1 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -52,7 +52,7 @@ void E3dView::ConvertMarkedToPolyObj(bool bLineToArea)
if (pObj && pObj->ISA(E3dPolyScene))
{
- sal_Bool bBezier = sal_False;
+ bool bBezier = false;
pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea);
if (pNewObj)
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index a54e46eba65f..fd639185e4c9 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -98,7 +98,7 @@ namespace svx
sal_Int32 nCommandType = CommandType::TABLE;
OUString sDatasource,sURL;
- sal_Bool bTryToParse = sal_True;
+ bool bTryToParse = true;
try
{
_rxForm->getPropertyValue(FM_PROP_COMMANDTYPE) >>= nCommandType;
@@ -271,7 +271,7 @@ namespace svx
// extract the any from the transferable
DataFlavor aFlavor;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor);
OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!");
@@ -519,7 +519,7 @@ namespace svx
// extract the any from the transferable
DataFlavor aFlavor;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor);
OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!");
@@ -591,7 +591,7 @@ namespace svx
// for compatibility: create a string which can be used for the SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format
- sal_Bool bTreatAsStatement = (CommandType::COMMAND == _nCommandType);
+ bool bTreatAsStatement = (CommandType::COMMAND == _nCommandType);
// statements are - in this old and ugly format - described as queries
const sal_Unicode cSeparator = sal_Unicode(11);
@@ -677,7 +677,7 @@ namespace svx
// extract the any from the transferable
DataFlavor aFlavor;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
SotExchange::GetFormatDataFlavor(getDescriptorFormatId(), aFlavor);
OSL_ENSURE(bSuccess, "OColumnTransferable::extractColumnDescriptor: invalid data format (no flavor)!");
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 3c41b1aef9ac..b64beae98f72 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -76,7 +76,7 @@ namespace svx
void OComponentTransferable::AddSupportedFormats()
{
- sal_Bool bForm = sal_True;
+ bool bForm = true;
try
{
Reference<XPropertySet> xProp;
@@ -118,7 +118,7 @@ namespace svx
ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData)
{
- sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(true));
+ bool bForm = _rData.HasFormat(getDescriptorFormatId(true));
if ( bForm || _rData.HasFormat(getDescriptorFormatId(false)) )
{
// the object has a real descriptor object (not just the old compatible format)
@@ -126,7 +126,7 @@ namespace svx
// extract the any from the transferable
DataFlavor aFlavor;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
SotExchange::GetFormatDataFlavor(getDescriptorFormatId(bForm), aFlavor);
OSL_ENSURE(bSuccess, "OComponentTransferable::extractColumnDescriptor: invalid data format (no flavor)!");
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ef2f6c9d6e6b..8d88f7e4a5a8 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -115,7 +115,7 @@ struct FmGridHeaderData
};
const sal_Int16 nChangeTypeOffset = 1000;
-void SetMenuItem(const ImageList& rList, sal_uInt16 nID, Menu* pMenu, Menu& rNewMenu, sal_Bool bDesignMode = sal_True, sal_Int16 nOffset = nChangeTypeOffset)
+void SetMenuItem(const ImageList& rList, sal_uInt16 nID, Menu* pMenu, Menu& rNewMenu, bool bDesignMode = true, sal_Int16 nOffset = nChangeTypeOffset)
{
pMenu->SetItemImage(nID, rList.GetImage(nID));
pMenu->EnableItem(nID, bDesignMode);
@@ -228,8 +228,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
TransferableDataHelper aDroppedData(_rEvt.maDropEvent.Transferable);
// check the formats
- sal_Bool bColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR);
- sal_Bool bFieldDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_FIELD_DESCRIPTOR);
+ bool bColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR);
+ bool bFieldDescriptor = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_FIELD_DESCRIPTOR);
if (!bColumnDescriptor && !bFieldDescriptor)
{
OSL_FAIL("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!");
@@ -386,7 +386,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
try
{
// need number formats
- Reference< XNumberFormatsSupplier > xSupplier = OStaticDataAccessTools().getNumberFormats(xConnection, sal_True);
+ Reference< XNumberFormatsSupplier > xSupplier = OStaticDataAccessTools().getNumberFormats(xConnection, true);
Reference< XNumberFormats > xNumberFormats;
if (xSupplier.is())
xNumberFormats = xSupplier->getNumberFormats();
@@ -479,7 +479,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
OSL_FAIL("FmGridHeader::ExecuteDrop: Exception occurred!");
}
- sal_Bool bDateNTimeCol = sal_False;
+ bool bDateNTimeCol = false;
if (!aPossibleTypes.empty())
{
sal_Int32 nPreferredType = aPossibleTypes[0];
@@ -491,7 +491,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
PopupMenu aTypeMenu;
PopupMenu* pMenu = aInsertMenu.GetPopupMenu(SID_FM_INSERTCOL);
for (std::vector<sal_uInt16>::const_iterator iter = aPossibleTypes.begin(); iter != aPossibleTypes.end(); ++iter)
- SetMenuItem(aImageList, *iter, pMenu, aTypeMenu, sal_True, 0);
+ SetMenuItem(aImageList, *iter, pMenu, aTypeMenu, true, 0);
nPreferredType = aTypeMenu.Execute(this, m_pImpl->aDropPosPixel);
}
@@ -627,7 +627,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu)
{
- sal_Bool bDesignMode = static_cast<FmGridControl*>(GetParent())->IsDesignMode();
+ bool bDesignMode = static_cast<FmGridControl*>(GetParent())->IsDesignMode();
Reference< ::com::sun::star::container::XIndexContainer > xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns());
// Aufbau des Insert Menues
@@ -646,7 +646,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
// EinfuegePosition, immer vor der aktuellen Spalte
sal_uInt16 nPos = GetModelColumnPos(nColId);
- sal_Bool bMarked = nColId && static_cast<FmGridControl*>(GetParent())->isColumnMarked(nColId);
+ bool bMarked = nColId && static_cast<FmGridControl*>(GetParent())->isColumnMarked(nColId);
ImageList aImageList( SVX_RES(RID_SVXIMGLIST_FMEXPL) );
PopupMenu* pControlMenu = new PopupMenu;
@@ -741,13 +741,13 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
}
// allow the 'hide column' item ?
- sal_Bool bAllowHide = bMarked; // a column is marked
+ bool bAllowHide = bMarked; // a column is marked
bAllowHide = bAllowHide || (!bDesignMode && (nPos != (sal_uInt16)-1)); // OR we are in alive mode and have hit a column
bAllowHide = bAllowHide && xCols.is(); // AND we have a column container
bAllowHide = bAllowHide && (xCols->getCount()-nHiddenCols > 1); // AND there are at least two visible columns
rMenu.EnableItem(SID_FM_HIDECOL, bAllowHide);
- sal_Bool bChecked = sal_False;
+ bool bChecked = false;
if (bMarked)
{
@@ -781,7 +781,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
delete pControlMenu;
OUString aFieldType;
- sal_Bool bReplace = sal_False;
+ bool bReplace = false;
InspectorAction eInspectorAction = eNone;
Reference< XPropertySet > xColumnToInspect;
switch (nExecutionResult)
@@ -798,52 +798,52 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
xColumnToInspect.set( xCols->getByIndex( nPos ), UNO_QUERY );
break;
case SID_FM_EDIT + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_EDIT:
aFieldType = FM_COL_TEXTFIELD;
break;
case SID_FM_COMBOBOX + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_COMBOBOX:
aFieldType = FM_COL_COMBOBOX;
break;
case SID_FM_LISTBOX + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_LISTBOX:
aFieldType = FM_COL_LISTBOX;
break;
case SID_FM_CHECKBOX + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_CHECKBOX:
aFieldType = FM_COL_CHECKBOX;
break;
case SID_FM_DATEFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_DATEFIELD:
aFieldType = FM_COL_DATEFIELD;
break;
case SID_FM_TIMEFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_TIMEFIELD:
aFieldType = FM_COL_TIMEFIELD;
break;
case SID_FM_NUMERICFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_NUMERICFIELD:
aFieldType = FM_COL_NUMERICFIELD;
break;
case SID_FM_CURRENCYFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_CURRENCYFIELD:
aFieldType = FM_COL_CURRENCYFIELD;
break;
case SID_FM_PATTERNFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_PATTERNFIELD:
aFieldType = FM_COL_PATTERNFIELD;
break;
case SID_FM_FORMATTEDFIELD + nChangeTypeOffset:
- bReplace = sal_True;
+ bReplace = true;
case SID_FM_FORMATTEDFIELD:
aFieldType = FM_COL_FORMATTEDFIELD;
break;
@@ -851,7 +851,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
{
Reference< ::com::sun::star::beans::XPropertySet > xCurCol(
xCols->getByIndex(nPos), css::uno::UNO_QUERY);
- xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny((sal_Bool)sal_True));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(true));
}
break;
case SID_FM_SHOWCOLS_MORE:
@@ -875,7 +875,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
{
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
- xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny((sal_Bool)sal_False));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
}
// TODO : there must be a more clever way to do this ....
// with the above the view is updated after every single model update ...
@@ -893,7 +893,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if (::comphelper::getBOOL(aHidden))
if (!--nExecutionResult)
{
- xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny((sal_Bool)sal_False));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
break;
}
}
@@ -1182,7 +1182,7 @@ void FmGridControl::DeleteSelectedRows()
// determine the next row to position after deletion
Any aBookmark;
- sal_Bool bNewPos = sal_False;
+ bool bNewPos = false;
// if the current row isn't selected we take the row as row after deletion
OSL_ENSURE( GetCurrentRow().Is(), "FmGridControl::DeleteSelectedRows: no current row here?" );
// crash reports suggest it can happen we don't have a current row - how?
@@ -1190,7 +1190,7 @@ void FmGridControl::DeleteSelectedRows()
if ( !IsRowSelected( GetCurrentPos() ) && !IsCurrentAppending() && GetCurrentRow().Is() )
{
aBookmark = GetCurrentRow()->GetBookmark();
- bNewPos = sal_True;
+ bNewPos = true;
}
else
{
@@ -1203,7 +1203,7 @@ void FmGridControl::DeleteSelectedRows()
{
GetSeekRow()->SetState(m_pSeekCursor, true);
- bNewPos = sal_True;
+ bNewPos = true;
// if it's not the row for inserting we keep the bookmark
if (!IsInsertionRow(nIdx))
aBookmark = m_pSeekCursor->getBookmark();
@@ -1217,7 +1217,7 @@ void FmGridControl::DeleteSelectedRows()
{
GetSeekRow()->SetState(m_pSeekCursor, true);
- bNewPos = sal_True;
+ bNewPos = true;
aBookmark = m_pSeekCursor->getBookmark();
}
}
@@ -1225,7 +1225,7 @@ void FmGridControl::DeleteSelectedRows()
// Sind alle Zeilen Selectiert
// Zweite bedingung falls keine einguegeZeile existiert
- sal_Bool bAllSelected = GetTotalCount() == nSelectedRows || GetRowCount() == nSelectedRows;
+ bool bAllSelected = GetTotalCount() == nSelectedRows || GetRowCount() == nSelectedRows;
BeginCursorAction();
@@ -1641,7 +1641,7 @@ void FmGridControl::InitColumnByField(
sal_Int32 nDataType = DataType::OTHER;
xField->getPropertyValue( FM_PROP_FIELDTYPE ) >>= nDataType;
- sal_Bool bIllegalType = sal_False;
+ bool bIllegalType = false;
switch ( nDataType )
{
case DataType::BLOB:
@@ -1649,7 +1649,7 @@ void FmGridControl::InitColumnByField(
case DataType::BINARY:
case DataType::VARBINARY:
case DataType::OTHER:
- bIllegalType = sal_True;
+ bIllegalType = true;
break;
}
@@ -2012,7 +2012,7 @@ sal_Int32 FmGridControl::GetSelectedColumn() const
void FmGridControl::KeyInput( const KeyEvent& rKEvt )
{
- sal_Bool bDone = sal_False;
+ bool bDone = false;
const KeyCode& rKeyCode = rKEvt.GetKeyCode();
if ( IsDesignMode()
&& !rKeyCode.IsShift()
@@ -2024,7 +2024,7 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt )
{
case KEY_ESCAPE:
GetParent()->GrabFocus();
- bDone = sal_True;
+ bDone = true;
break;
case KEY_DELETE:
if ( GetSelectColumnCount() && GetPeer() && m_nCurrentSelectedColumn >= 0 )
@@ -2048,7 +2048,7 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt )
}
}
}
- bDone = sal_True;
+ bDone = true;
break;
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 53237ea2d61d..98af429e2228 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -195,7 +195,7 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( Runtim
EventObject aMulti( e );
aMulti.Source = &m_rParent;
- sal_Bool bResult = sal_True;
+ bool bResult = true;
if (getLength())
{
::cppu::OInterfaceIteratorHelper aIter(*this);
@@ -566,7 +566,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
pPeer->addContainerListener( &m_aContainerListeners );
// forward the design mode
- sal_Bool bForceAlivePeer = m_bInDraw && !maComponentInfos.bVisible;
+ bool bForceAlivePeer = m_bInDraw && !maComponentInfos.bVisible;
// (we force an alive-mode peer if we're in "draw", cause in this case the peer will be used for drawing in
// foreign devices. We ensure this with the visibility check as an living peer is assumed to be noncritical
// only if invisible)
@@ -1282,7 +1282,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType
Sequence<sal_Bool> aReturnSequence(nColumns);
sal_Bool* pReturnArray = aReturnSequence.getArray();
- sal_Bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY);
+ bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY);
DbGridColumn* pCol;
Reference< ::com::sun::star::sdb::XColumn > xFieldContent;
@@ -1353,7 +1353,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
Sequence< Any> aReturnSequence(nColumnCount);
Any* pReturnArray = aReturnSequence.getArray();
- sal_Bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY);
+ bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY);
Reference< ::com::sun::star::sdb::XColumn > xFieldContent;
DbGridColumn* pCol;
for (sal_Int32 i=0; i < nColumnCount; ++i)
@@ -1448,7 +1448,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
return;
sal_uInt16 nId = pGrid->GetColumnIdFromModelPos((sal_uInt16)i);
- sal_Bool bInvalidateColumn = sal_False;
+ bool bInvalidateColumn = false;
if (evt.PropertyName == FM_PROP_LABEL)
{
@@ -1499,19 +1499,19 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
DbGridColumn* pCol = pGrid->GetColumns().at( i );
pCol->SetAlignmentFromModel(-1);
- bInvalidateColumn = sal_True;
+ bInvalidateColumn = true;
}
}
else if (evt.PropertyName == FM_PROP_FORMATKEY)
{
if (!isDesignMode())
- bInvalidateColumn = sal_True;
+ bInvalidateColumn = true;
}
// need to invalidate the affected column ?
if (bInvalidateColumn)
{
- sal_Bool bWasEditing = pGrid->IsEditing();
+ bool bWasEditing = pGrid->IsEditing();
if (bWasEditing)
pGrid->DeactivateCell();
@@ -1548,10 +1548,10 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception )
EventObject aEvt(static_cast< ::cppu::OWeakObject* >(this));
::cppu::OInterfaceIteratorHelper aIter(m_aUpdateListeners);
- sal_Bool bCancel = sal_False;
+ bool bCancel = false;
while (aIter.hasMoreElements() && !bCancel)
if ( !static_cast< XUpdateListener* >( aIter.next() )->approveUpdate( aEvt ) )
- bCancel = sal_True;
+ bCancel = true;
if (!bCancel)
bCancel = !pGrid->commit();
@@ -1804,7 +1804,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
Reference< XPropertySet > xOldColumn(
evt.ReplacedElement, css::uno::UNO_QUERY);
- sal_Bool bWasEditing = pGrid->IsEditing();
+ bool bWasEditing = pGrid->IsEditing();
if (bWasEditing)
pGrid->DeactivateCell();
@@ -1868,7 +1868,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
FmGridControl* pGrid = (FmGridControl*) GetWindow();
- sal_Bool bVoid = !Value.hasValue();
+ bool bVoid = !Value.hasValue();
if ( PropertyName == FM_PROP_TEXTLINECOLOR )
{
@@ -2019,19 +2019,19 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
}
else if ( PropertyName == FM_PROP_HASNAVIGATION )
{
- sal_Bool bValue( sal_True );
+ bool bValue( true );
OSL_VERIFY( Value >>= bValue );
pGrid->EnableNavigationBar( bValue );
}
else if ( PropertyName == FM_PROP_RECORDMARKER )
{
- sal_Bool bValue( sal_True );
+ bool bValue( true );
OSL_VERIFY( Value >>= bValue );
pGrid->EnableHandle( bValue );
}
else if ( PropertyName == FM_PROP_ENABLED )
{
- sal_Bool bValue( sal_True );
+ bool bValue( true );
OSL_VERIFY( Value >>= bValue );
// In design mode, disable only the data window.
@@ -2105,17 +2105,17 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc
}
else if ( _rPropertyName == FM_PROP_HASNAVIGATION )
{
- sal_Bool bHasNavBar = pGrid->HasNavigationBar();
- aProp <<= (sal_Bool)bHasNavBar;
+ bool bHasNavBar = pGrid->HasNavigationBar();
+ aProp <<= bHasNavBar;
}
else if ( _rPropertyName == FM_PROP_RECORDMARKER )
{
- sal_Bool bHasHandle = pGrid->HasHandle();
- aProp <<= (sal_Bool)bHasHandle;
+ bool bHasHandle = pGrid->HasHandle();
+ aProp <<= bHasHandle;
}
else if ( _rPropertyName == FM_PROP_ENABLED )
{
- aProp <<= (sal_Bool)pDataWindow->IsEnabled();
+ aProp <<= pDataWindow->IsEnabled();
}
else
aProp = VCLXWindow::getProperty( _rPropertyName );
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 35eb806bef2d..d730dd69be9a 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -155,7 +155,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s
case DataType::DATE:
case DataType::TIME:
case DataType::TIMESTAMP:
- m_bDateTime = sal_True;
+ m_bDateTime = true;
case DataType::BIT:
case DataType::BOOLEAN:
@@ -169,7 +169,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s
case DataType::NUMERIC:
case DataType::DECIMAL:
m_nAlign = ::com::sun::star::awt::TextAlign::RIGHT;
- m_bNumeric = sal_True;
+ m_bNumeric = true;
break;
default:
m_nAlign = ::com::sun::star::awt::TextAlign::LEFT;
@@ -270,12 +270,12 @@ void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumb
}
-sal_Bool DbGridColumn::Commit()
+bool DbGridColumn::Commit()
{
- sal_Bool bResult = sal_True;
+ bool bResult = true;
if (!m_bInSave && m_pCell)
{
- m_bInSave = sal_True;
+ m_bInSave = true;
bResult = m_pCell->Commit();
// store the data into the model
@@ -286,7 +286,7 @@ sal_Bool DbGridColumn::Commit()
if (xComp.is())
bResult = xComp->commit();
}
- m_bInSave = sal_False;
+ m_bInSave = false;
}
return bResult;
}
@@ -326,8 +326,8 @@ void DbGridColumn::Clear()
m_nFormatKey = 0;
m_nFieldPos = -1;
- m_bReadOnly = sal_True;
- m_bAutoValue = sal_False;
+ m_bReadOnly = true;
+ m_bAutoValue = false;
m_nFieldType = DataType::OTHER;
}
@@ -390,7 +390,7 @@ sal_Int16 DbGridColumn::SetAlignmentFromModel(sal_Int16 nStandardAlign)
}
-void DbGridColumn::setLock(sal_Bool _bLock)
+void DbGridColumn::setLock(bool _bLock)
{
if (m_bLocked == _bLock)
return;
@@ -543,13 +543,13 @@ TYPEINIT1( DbNumericField, DbSpinField )
TYPEINIT1( DbFilterField, DbCellControl )
-DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
+DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ )
:OPropertyChangeListener(m_aMutex)
,m_pModelChangeBroadcaster(NULL)
,m_pFieldChangeBroadcaster(NULL)
- ,m_bTransparent( sal_False )
- ,m_bAlignedController( sal_True )
- ,m_bAccessingValueProperty( sal_False )
+ ,m_bTransparent( false )
+ ,m_bAlignedController( true )
+ ,m_bAccessingValueProperty( false )
,m_rColumn( _rColumn )
,m_pPainter( NULL )
,m_pWindow( NULL )
@@ -562,14 +562,14 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
m_pModelChangeBroadcaster->acquire();
// be listener for some common properties
- implDoPropertyListening( FM_PROP_READONLY, sal_False );
- implDoPropertyListening( FM_PROP_ENABLED, sal_False );
+ implDoPropertyListening( FM_PROP_READONLY, false );
+ implDoPropertyListening( FM_PROP_ENABLED, false );
// add as listener for all know "value" properties
- implDoPropertyListening( FM_PROP_VALUE, sal_False );
- implDoPropertyListening( FM_PROP_STATE, sal_False );
- implDoPropertyListening( FM_PROP_TEXT, sal_False );
- implDoPropertyListening( FM_PROP_EFFECTIVE_VALUE, sal_False );
+ implDoPropertyListening( FM_PROP_VALUE, false );
+ implDoPropertyListening( FM_PROP_STATE, false );
+ implDoPropertyListening( FM_PROP_TEXT, false );
+ implDoPropertyListening( FM_PROP_EFFECTIVE_VALUE, false );
// be listener at the bound field as well
try
@@ -596,7 +596,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
}
-void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent)
+void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, bool _bWarnIfNotExistent)
{
try
{
@@ -688,7 +688,7 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
}
else if ( _rEvent.PropertyName.equals( FM_PROP_ISREADONLY ) )
{
- sal_Bool bReadOnly = sal_True;
+ bool bReadOnly = true;
_rEvent.NewValue >>= bReadOnly;
m_rColumn.SetReadOnly(bReadOnly);
implAdjustReadOnly( xSourceProps, false);
@@ -702,12 +702,12 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
}
-sal_Bool DbCellControl::Commit()
+bool DbCellControl::Commit()
{
// lock the listening for value property changes
lockValueProperty();
// commit the content of the control into the model's value property
- sal_Bool bReturn = sal_False;
+ bool bReturn = false;
try
{
bReturn = commitControl();
@@ -767,7 +767,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni
{
Color aTextColor( rParent.IsControlForeground() ? rParent.GetControlForeground() : rParent.GetTextColor() );
- sal_Bool bTextLineColor = rParent.IsTextLineColor();
+ bool bTextLineColor = rParent.IsTextLineColor();
Color aTextLineColor( rParent.GetTextLineColor() );
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
@@ -838,7 +838,7 @@ void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxMode
Edit* pEditWindow = dynamic_cast< Edit* >( m_pWindow );
if ( pEditWindow )
{
- sal_Bool bReadOnly = m_rColumn.IsReadOnly();
+ bool bReadOnly = m_rColumn.IsReadOnly();
if ( !bReadOnly )
{
_rxModel->getPropertyValue( i_bReadOnly ? OUString(FM_PROP_READONLY) : OUString(FM_PROP_ISREADONLY)) >>= bReadOnly;
@@ -855,7 +855,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel
DBG_ASSERT( _rxModel.is(), "DbCellControl::implAdjustEnabled: invalid model!" );
if ( m_pWindow && _rxModel.is() )
{
- sal_Bool bEnable = sal_True;
+ bool bEnable = true;
_rxModel->getPropertyValue( FM_PROP_ENABLED ) >>= bEnable;
m_pWindow->Enable( bEnable );
}
@@ -1015,11 +1015,11 @@ double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >
}
else
{
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
try
{
fValue = _rxField->getDouble();
- bSuccess = sal_True;
+ bSuccess = true;
}
catch(const Exception&) { }
if (!bSuccess)
@@ -1084,7 +1084,7 @@ DbTextField::DbTextField(DbGridColumn& _rColumn)
,m_pEdit( NULL )
,m_pPainterImplementation( NULL )
,m_nKeyType(::com::sun::star::util::NumberFormat::TEXT)
- ,m_bIsSimpleEdit( sal_True )
+ ,m_bIsSimpleEdit( true )
{
}
@@ -1115,7 +1115,7 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
}
// is this a multi-line field?
- sal_Bool bIsMultiLine = sal_False;
+ bool bIsMultiLine = false;
try
{
if ( xModel.is() )
@@ -1226,7 +1226,7 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbTextField::commitControl()
+bool DbTextField::commitControl()
{
OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) );
// we have to check if the length before we can decide if the value was modified
@@ -1240,7 +1240,7 @@ sal_Bool DbTextField::commitControl()
aText = sOldValue;
}
m_rColumn.getModel()->setPropertyValue( FM_PROP_TEXT, makeAny( aText ) );
- return sal_True;
+ return true;
}
@@ -1350,7 +1350,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
Reference< XRowSet > xCursorForm(xCursor, UNO_QUERY);
if (xCursorForm.is())
{ // wenn wir vom Cursor den Formatter nehmen, dann auch den Key vom Feld, an das wir gebunden sind
- m_xSupplier = getNumberFormats(getRowSetConnection(xCursorForm), sal_False);
+ m_xSupplier = getNumberFormats(getRowSetConnection(xCursorForm), false);
if (m_rColumn.GetField().is())
nFormatKey = ::comphelper::getINT32(m_rColumn.GetField()->getPropertyValue(FM_PROP_FORMATKEY));
@@ -1393,7 +1393,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
// Min- und Max-Werte
if (m_rColumn.IsNumeric())
{
- sal_Bool bClearMin = sal_True;
+ bool bClearMin = true;
if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MIN, xUnoModel))
{
Any aMin( xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MIN));
@@ -1403,7 +1403,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
double dMin = ::comphelper::getDouble(aMin);
((FormattedField*)m_pWindow)->SetMinValue(dMin);
((FormattedField*)m_pPainter)->SetMinValue(dMin);
- bClearMin = sal_False;
+ bClearMin = false;
}
}
if (bClearMin)
@@ -1411,7 +1411,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
((FormattedField*)m_pWindow)->ClearMinValue();
((FormattedField*)m_pPainter)->ClearMinValue();
}
- sal_Bool bClearMax = sal_True;
+ bool bClearMax = true;
if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MAX, xUnoModel))
{
Any aMin( xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MAX));
@@ -1421,7 +1421,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
double dMin = ::comphelper::getDouble(aMin);
((FormattedField*)m_pWindow)->SetMaxValue(dMin);
((FormattedField*)m_pPainter)->SetMaxValue(dMin);
- bClearMax = sal_False;
+ bClearMax = false;
}
}
if (bClearMax)
@@ -1616,7 +1616,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbFormattedField::commitControl()
+bool DbFormattedField::commitControl()
{
Any aNewVal;
FormattedField& rField = *(FormattedField*)m_pWindow;
@@ -1631,7 +1631,7 @@ sal_Bool DbFormattedField::commitControl()
aNewVal <<= OUString(rField.GetTextValue());
m_rColumn.getModel()->setPropertyValue(FM_PROP_EFFECTIVE_VALUE, aNewVal);
- return sal_True;
+ return true;
}
@@ -1639,9 +1639,9 @@ sal_Bool DbFormattedField::commitControl()
DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
- :DbCellControl( _rColumn, sal_True )
+ :DbCellControl( _rColumn, true )
{
- setAlignedController( sal_False );
+ setAlignedController( false );
}
namespace
@@ -1662,7 +1662,7 @@ namespace
void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
{
- setTransparent( sal_True );
+ setTransparent( true );
m_pWindow = new CheckBoxControl( &rParent );
m_pPainter = new CheckBoxControl( &rParent );
@@ -1682,7 +1682,7 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT );
setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT );
- sal_Bool bTristate = sal_True;
+ bool bTristate = true;
OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate );
static_cast< CheckBoxControl* >( m_pWindow )->GetBox().EnableTriState( bTristate );
static_cast< CheckBoxControl* >( m_pPainter )->GetBox().EnableTriState( bTristate );
@@ -1709,7 +1709,7 @@ static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XCol
{
try
{
- sal_Bool bValue = _rxField->getBoolean();
+ bool bValue = _rxField->getBoolean();
if (!_rxField->wasNull())
eState = bValue ? TRISTATE_TRUE : TRISTATE_FALSE;
}
@@ -1747,11 +1747,11 @@ void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbCheckBox::commitControl()
+bool DbCheckBox::commitControl()
{
m_rColumn.getModel()->setPropertyValue( FM_PROP_STATE,
makeAny( (sal_Int16)( static_cast< CheckBoxControl* >( m_pWindow )->GetBox().GetState() ) ) );
- return sal_True;
+ return true;
}
@@ -1781,7 +1781,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe
{
OUString aLitMask;
OUString aEditMask;
- sal_Bool bStrict = sal_False;
+ bool bStrict = false;
_rxModel->getPropertyValue( FM_PROP_LITERALMASK ) >>= aLitMask;
_rxModel->getPropertyValue( FM_PROP_EDITMASK ) >>= aEditMask;
@@ -1870,11 +1870,11 @@ void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbPatternField::commitControl()
+bool DbPatternField::commitControl()
{
OUString aText(m_pWindow->GetText());
m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(aText));
- return sal_True;
+ return true;
}
@@ -1940,9 +1940,9 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
sal_Int32 nMin = (sal_Int32)getDouble( _rxModel->getPropertyValue( FM_PROP_VALUEMIN ) );
sal_Int32 nMax = (sal_Int32)getDouble( _rxModel->getPropertyValue( FM_PROP_VALUEMAX ) );
sal_Int32 nStep = (sal_Int32)getDouble( _rxModel->getPropertyValue( FM_PROP_VALUESTEP ) );
- sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
+ bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
sal_Int16 nScale = getINT16( _rxModel->getPropertyValue( FM_PROP_DECIMAL_ACCURACY ) );
- sal_Bool bThousand = getBOOL( _rxModel->getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) );
+ bool bThousand = getBOOL( _rxModel->getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) );
static_cast< DoubleNumericField* >( m_pWindow )->SetMinValue(nMin);
static_cast< DoubleNumericField* >( m_pWindow )->SetMaxValue(nMax);
@@ -1961,7 +1961,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
if ( m_rColumn.GetParent().getDataSource() )
xForm = Reference< XRowSet >( ( Reference< XInterface > )*m_rColumn.GetParent().getDataSource(), UNO_QUERY );
if ( xForm.is() )
- xSupplier = getNumberFormats( getRowSetConnection( xForm ), sal_True );
+ xSupplier = getNumberFormats( getRowSetConnection( xForm ), true );
SvNumberFormatter* pFormatterUsed = NULL;
if ( xSupplier.is() )
{
@@ -2043,7 +2043,7 @@ void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbNumericField::commitControl()
+bool DbNumericField::commitControl()
{
OUString aText( m_pWindow->GetText());
Any aVal;
@@ -2054,7 +2054,7 @@ sal_Bool DbNumericField::commitControl()
aVal <<= (double)fValue;
}
m_rColumn.getModel()->setPropertyValue(FM_PROP_VALUE, aVal);
- return sal_True;
+ return true;
}
@@ -2085,8 +2085,8 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS
double nMin = getDouble( _rxModel->getPropertyValue( FM_PROP_VALUEMIN ) );
double nMax = getDouble( _rxModel->getPropertyValue( FM_PROP_VALUEMAX ) );
double nStep = getDouble( _rxModel->getPropertyValue( FM_PROP_VALUESTEP ) );
- sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
- sal_Bool bThousand = getBOOL( _rxModel->getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) );
+ bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
+ bool bThousand = getBOOL( _rxModel->getPropertyValue( FM_PROP_SHOWTHOUSANDSEP ) );
OUString aStr( getString( _rxModel->getPropertyValue(FM_PROP_CURRENCYSYMBOL ) ) );
static_cast< LongCurrencyField* >( m_pWindow )->SetUseThousandSep( bThousand );
@@ -2189,7 +2189,7 @@ void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbCurrencyField::commitControl()
+bool DbCurrencyField::commitControl()
{
OUString aText(m_pWindow->GetText());
Any aVal;
@@ -2203,7 +2203,7 @@ sal_Bool DbCurrencyField::commitControl()
aVal <<= (double)fValue;
}
m_rColumn.getModel()->setPropertyValue(FM_PROP_VALUE, aVal);
- return sal_True;
+ return true;
}
@@ -2224,7 +2224,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel )
{
// check if there is a DropDown property set to TRUE
- sal_Bool bDropDown = !hasProperty( FM_PROP_DROPDOWN, _rxModel )
+ bool bDropDown = !hasProperty( FM_PROP_DROPDOWN, _rxModel )
|| getBOOL( _rxModel->getPropertyValue( FM_PROP_DROPDOWN ) );
if ( bDropDown )
_nFieldStyle |= WB_DROPDOWN;
@@ -2249,12 +2249,12 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_DATEMIN ) >>= aMin );
util::Date aMax;
OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_DATEMAX ) >>= aMax );
- sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
+ bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
Any aCentury = _rxModel->getPropertyValue( FM_PROP_DATE_SHOW_CENTURY );
if ( aCentury.getValueType().getTypeClass() != TypeClass_VOID )
{
- sal_Bool bShowDateCentury = getBOOL( aCentury );
+ bool bShowDateCentury = getBOOL( aCentury );
static_cast<DateField*>( m_pWindow )->SetShowDateCentury( bShowDateCentury );
static_cast<DateField*>( m_pPainter )->SetShowDateCentury( bShowDateCentury );
@@ -2326,7 +2326,7 @@ void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbDateField::commitControl()
+bool DbDateField::commitControl()
{
OUString aText(m_pWindow->GetText());
Any aVal;
@@ -2336,7 +2336,7 @@ sal_Bool DbDateField::commitControl()
aVal.clear();
m_rColumn.getModel()->setPropertyValue(FM_PROP_DATE, aVal);
- return sal_True;
+ return true;
}
@@ -2370,7 +2370,7 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_TIMEMIN ) >>= aMin );
util::Time aMax;
OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_TIMEMAX ) >>= aMax );
- sal_Bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
+ bool bStrict = getBOOL( _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) );
static_cast< TimeField* >( m_pWindow )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
static_cast< TimeField* >( m_pWindow )->SetMin( aMin );
@@ -2438,7 +2438,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbTimeField::commitControl()
+bool DbTimeField::commitControl()
{
OUString aText(m_pWindow->GetText());
Any aVal;
@@ -2448,7 +2448,7 @@ sal_Bool DbTimeField::commitControl()
aVal.clear();
m_rColumn.getModel()->setPropertyValue(FM_PROP_TIME, aVal);
- return sal_True;
+ return true;
}
@@ -2459,7 +2459,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn)
:DbCellControl(_rColumn)
,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED)
{
- setAlignedController( sal_False );
+ setAlignedController( false );
doPropertyListening( FM_PROP_STRINGITEMLIST );
doPropertyListening( FM_PROP_LINECOUNT );
@@ -2576,19 +2576,19 @@ void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbComboBox::commitControl()
+bool DbComboBox::commitControl()
{
OUString aText( m_pWindow->GetText());
m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(aText));
- return sal_True;
+ return true;
}
DbListBox::DbListBox(DbGridColumn& _rColumn)
:DbCellControl(_rColumn)
- ,m_bBound(sal_False)
+ ,m_bBound(false)
{
- setAlignedController( sal_False );
+ setAlignedController( false );
doPropertyListening( FM_PROP_STRINGITEMLIST );
doPropertyListening( FM_PROP_LINECOUNT );
@@ -2613,7 +2613,7 @@ void DbListBox::SetList(const Any& rItems)
ListBoxControl* pField = (ListBoxControl*)m_pWindow;
pField->Clear();
- m_bBound = sal_False;
+ m_bBound = false;
::comphelper::StringSequence aTest;
if (rItems >>= aTest)
@@ -2724,7 +2724,7 @@ void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbListBox::commitControl()
+bool DbListBox::commitControl()
{
Any aVal;
Sequence<sal_Int16> aSelectSeq;
@@ -2735,7 +2735,7 @@ sal_Bool DbListBox::commitControl()
}
aVal <<= aSelectSeq;
m_rColumn.getModel()->setPropertyValue(FM_PROP_SELECT_SEQ, aVal);
- return sal_True;
+ return true;
}
@@ -2744,12 +2744,12 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
:DbCellControl(_rColumn)
,OSQLParserClient(rxContext)
,m_nControlClass(::com::sun::star::form::FormComponentType::TEXTFIELD)
- ,m_bFilterList(sal_False)
- ,m_bFilterListFilled(sal_False)
- ,m_bBound(sal_False)
+ ,m_bFilterList(false)
+ ,m_bFilterListFilled(false)
+ ,m_bBound(false)
{
- setAlignedController( sal_False );
+ setAlignedController( false );
}
@@ -2778,7 +2778,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
}
-void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox)
+void DbFilterField::SetList(const Any& rItems, bool bComboBox)
{
::comphelper::StringSequence aTest;
rItems >>= aTest;
@@ -2936,13 +2936,13 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
}
-sal_Bool DbFilterField::commitControl()
+bool DbFilterField::commitControl()
{
OUString aText(m_aText);
switch (m_nControlClass)
{
case ::com::sun::star::form::FormComponentType::CHECKBOX:
- return sal_True;
+ return true;
case ::com::sun::star::form::FormComponentType::LISTBOX:
aText = OUString();
if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount())
@@ -2957,7 +2957,7 @@ sal_Bool DbFilterField::commitControl()
m_aText = aText;
m_aCommitLink.Call(this);
}
- return sal_True;
+ return true;
default:
aText = m_pWindow->GetText();
}
@@ -3000,7 +3000,7 @@ sal_Bool DbFilterField::commitControl()
displayException(aError, m_pWindow->GetParent());
// TODO: transport the title
- return sal_False;
+ return false;
}
}
else
@@ -3009,7 +3009,7 @@ sal_Bool DbFilterField::commitControl()
m_pWindow->SetText(m_aText);
m_aCommitLink.Call(this);
}
- return sal_True;
+ return true;
}
@@ -3053,7 +3053,7 @@ void DbFilterField::Update()
// should we fill the combobox with a filter proposal?
if (m_bFilterList && !m_bFilterListFilled)
{
- m_bFilterListFilled = sal_True;
+ m_bFilterListFilled = true;
Reference< ::com::sun::star::beans::XPropertySet > xField = m_rColumn.GetField();
if (!xField.is())
return;
@@ -3125,7 +3125,7 @@ void DbFilterField::Update()
xStatement = xConnection->createStatement();
Reference< ::com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY);
- xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, makeAny((sal_Bool)sal_True));
+ xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, makeAny(true));
xListCursor = xStatement->executeQuery(aStatement.makeStringAndClear());
@@ -3590,7 +3590,7 @@ TYPEINIT1(FmXTextCell, FmXDataCell);
FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXDataCell( pColumn, _rControl )
- ,m_bFastPaint( sal_True )
+ ,m_bFastPaint( true )
{
}
@@ -3653,7 +3653,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
m_pEditImplementation = pTextField->GetEditImplementation();
if ( !pTextField->IsSimpleEdit() )
- m_bFastPaint = sal_False;
+ m_bFastPaint = false;
}
else
{
@@ -4327,7 +4327,7 @@ sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException, std::
{
::osl::MutexGuard aGuard( m_aMutex );
- sal_Bool bMulti = sal_False;
+ bool bMulti = false;
if (m_pBox)
bMulti = m_pBox->IsMultiSelectionEnabled();
return bMulti;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 35de32a8a8bb..a2b03394c545 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -725,7 +725,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
{
case STATE_CHANGE_MIRRORING:
{
- sal_Bool bIsRTLEnabled = IsRTLEnabled();
+ bool bIsRTLEnabled = IsRTLEnabled();
for ( size_t i=0; i < (sizeof (pWindows) / sizeof(pWindows[0])); ++i )
pWindows[i]->EnableRTL( bIsRTLEnabled );
}
@@ -1131,7 +1131,7 @@ void DbGridControl::EnableHandle(bool bEnable)
namespace
{
- bool adjustModeForScrollbars( BrowserMode& _rMode, sal_Bool _bNavigationBar, sal_Bool _bHideScrollbars )
+ bool adjustModeForScrollbars( BrowserMode& _rMode, bool _bNavigationBar, bool _bHideScrollbars )
{
BrowserMode nOldMode = _rMode;
@@ -1309,7 +1309,7 @@ void DbGridControl::EnablePermanentCursor(bool bEnable)
}
SetMode(m_nMode);
- sal_Bool bWasEditing = IsEditing();
+ bool bWasEditing = IsEditing();
DeactivateCell();
if (bWasEditing)
ActivateCell();
@@ -1375,7 +1375,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
// get a new formatter and data cursor
m_xFormatter = NULL;
OStaticDataAccessTools aStaticTools;
- Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = aStaticTools.getNumberFormats(aStaticTools.getRowSetConnection(_xCursor), sal_True);
+ Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = aStaticTools.getNumberFormats(aStaticTools.getRowSetConnection(_xCursor), true);
if (xSupplier.is())
{
m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
@@ -1456,7 +1456,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
DBG_UNHANDLED_EXCEPTION();
}
- sal_Bool bPermanentCursor = IsPermanentCursorEnabled();
+ bool bPermanentCursor = IsPermanentCursorEnabled();
m_nMode = DEFAULT_BROWSE_MODE;
if ( bPermanentCursor )
@@ -2149,9 +2149,9 @@ void DbGridControl::AdjustDataSource(bool bFull)
&& !m_pDataCursor->rowDeleted()
)
{
- sal_Bool bEqualBookmarks = CompareBookmark( m_xCurrentRow->GetBookmark(), m_pDataCursor->getBookmark() );
+ bool bEqualBookmarks = CompareBookmark( m_xCurrentRow->GetBookmark(), m_pDataCursor->getBookmark() );
- sal_Bool bDataCursorIsOnNew = sal_False;
+ bool bDataCursorIsOnNew = false;
m_pDataCursor->getPropertySet()->getPropertyValue( FM_PROP_ISNEW ) >>= bDataCursorIsOnNew;
if ( bEqualBookmarks && !bDataCursorIsOnNew )
@@ -2394,7 +2394,7 @@ void DbGridControl::MoveToLast()
{
try
{
- sal_Bool bRes = m_pSeekCursor->last();
+ bool bRes = m_pSeekCursor->last();
if (bRes)
{
@@ -2438,7 +2438,7 @@ void DbGridControl::MoveToNext()
}
else
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
try
{
// try to move to next row
@@ -2504,7 +2504,7 @@ void DbGridControl::AppendNew()
{
try
{
- sal_Bool bRes = m_pSeekCursor->last();
+ bool bRes = m_pSeekCursor->last();
if (bRes)
{
@@ -2618,7 +2618,7 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMenu)
{
- sal_Bool bDelete = (m_nOptions & OPT_DELETE) && GetSelectRowCount() && !IsCurrentAppending();
+ bool bDelete = (m_nOptions & OPT_DELETE) && GetSelectRowCount() && !IsCurrentAppending();
// if only a blank row is selected than do not delete
bDelete = bDelete && !((m_nOptions & OPT_INSERT) && GetSelectRowCount() == 1 && IsRowSelected(GetRowCount() - 1));
@@ -2666,7 +2666,7 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) th
{
Reference< XPropertySet > xSource(evt.Source, UNO_QUERY);
DBG_ASSERT( xSource.is(), "DbGridControl::DataSourcePropertyChanged: invalid event source!" );
- sal_Bool bIsNew = sal_False;
+ bool bIsNew = false;
if (xSource.is())
bIsNew = ::comphelper::getBOOL(xSource->getPropertyValue(FM_PROP_ISNEW));
@@ -2847,8 +2847,8 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
return NULL;
}
- sal_Bool bInsert = (m_xCurrentRow->IsNew() && (m_nOptions & OPT_INSERT));
- sal_Bool bUpdate = (!m_xCurrentRow->IsNew() && (m_nOptions & OPT_UPDATE));
+ bool bInsert = (m_xCurrentRow->IsNew() && (m_nOptions & OPT_INSERT));
+ bool bUpdate = (!m_xCurrentRow->IsNew() && (m_nOptions & OPT_UPDATE));
if ((bInsert && !pColumn->IsAutoValue()) || bUpdate || m_bForceROController)
{
@@ -2959,8 +2959,8 @@ void DbGridControl::Undo()
BeginCursorAction();
- sal_Bool bAppending = m_xCurrentRow->IsNew();
- sal_Bool bDirty = m_xCurrentRow->IsModified();
+ bool bAppending = m_xCurrentRow->IsNew();
+ bool bDirty = m_xCurrentRow->IsModified();
try
{
@@ -3126,7 +3126,7 @@ bool DbGridControl::SaveRow()
m_bUpdating = true;
BeginCursorAction();
- sal_Bool bAppending = m_xCurrentRow->IsNew();
+ bool bAppending = m_xCurrentRow->IsNew();
bool bSuccess = false;
try
{
@@ -3197,9 +3197,9 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt)
const KeyEvent* pKeyEvent = rEvt.GetKeyEvent();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
- sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift();
- sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
- sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
+ bool bShift = pKeyEvent->GetKeyCode().IsShift();
+ bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
+ bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
if ( ( KEY_TAB == nCode ) && bCtrl && !bAlt )
{
// Ctrl-Tab is used to step out of the control, without traveling to the
@@ -3289,7 +3289,7 @@ void DbGridControl::HideColumn(sal_uInt16 nId)
DBG_ASSERT(pColumn, "DbGridControl::HideColumn : somebody did hide a nonexistent column !");
if (pColumn)
{
- pColumn->m_bHidden = sal_True;
+ pColumn->m_bHidden = true;
pColumn->m_nLastVisibleWidth = CalcReverseZoom(lCurrentWidth);
}
@@ -3357,7 +3357,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId)
OUString aName;
pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName;
InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos);
- pColumn->m_bHidden = sal_False;
+ pColumn->m_bHidden = false;
ActivateCell();
Invalidate();
@@ -3542,7 +3542,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
if (pColumn)
{
- sal_Bool bAcquiredPaintSafety = sal_False;
+ bool bAcquiredPaintSafety = false;
while (!m_bWantDestruction && !bAcquiredPaintSafety)
bAcquiredPaintSafety = Application::GetSolarMutex().tryToAcquire();
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 5b3619a01f9f..a17f12b2ee66 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -165,7 +165,7 @@ namespace
return s_nCounter;
}
- OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,sal_Bool _bSet = sal_False)
+ OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,bool _bSet = false)
{
static OSystemParseContext* s_pSharedContext = NULL;
if ( _pContext && !s_pSharedContext )
@@ -199,7 +199,7 @@ OParseContextClient::~OParseContextClient()
{
::osl::MutexGuard aGuard( getSafteyMutex() );
if ( 0 == osl_atomic_decrement( &getCounter() ) )
- delete getSharedContext(NULL,sal_True);
+ delete getSharedContext(NULL,true);
}
}
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index dc75cb6c7875..491795491bab 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -43,8 +43,8 @@ namespace svx
class ODADescriptorImpl
{
protected:
- sal_Bool m_bSetOutOfDate : 1;
- sal_Bool m_bSequenceOutOfDate : 1;
+ bool m_bSetOutOfDate : 1;
+ bool m_bSequenceOutOfDate : 1;
public:
typedef ::std::map< DataAccessDescriptorProperty, Any > DescriptorValues;
@@ -66,13 +66,13 @@ namespace svx
@return <TRUE/>
if and only if the sequence contained valid properties only
*/
- sal_Bool buildFrom( const Sequence< PropertyValue >& _rValues );
+ bool buildFrom( const Sequence< PropertyValue >& _rValues );
/** builds the descriptor from a property set
@return <TRUE/>
if and only if the set contained valid properties only
*/
- sal_Bool buildFrom( const Reference< XPropertySet >& _rValues );
+ bool buildFrom( const Reference< XPropertySet >& _rValues );
protected:
static PropertyValue buildPropertyValue( const DescriptorValues::const_iterator& _rPos );
@@ -82,8 +82,8 @@ namespace svx
ODADescriptorImpl::ODADescriptorImpl()
- :m_bSetOutOfDate(sal_True)
- ,m_bSequenceOutOfDate(sal_True)
+ :m_bSetOutOfDate(true)
+ ,m_bSequenceOutOfDate(true)
{
}
@@ -100,11 +100,11 @@ namespace svx
}
- sal_Bool ODADescriptorImpl::buildFrom( const Sequence< PropertyValue >& _rValues )
+ bool ODADescriptorImpl::buildFrom( const Sequence< PropertyValue >& _rValues )
{
const MapString2PropertyEntry& rProperties = getPropertyMap();
- sal_Bool bValidPropsOnly = sal_True;
+ bool bValidPropsOnly = true;
// loop through the sequence, and fill our m_aValues
const PropertyValue* pValues = _rValues.getConstArray();
@@ -119,22 +119,22 @@ namespace svx
}
else
// unknown property
- bValidPropsOnly = sal_False;
+ bValidPropsOnly = false;
}
if (bValidPropsOnly)
{
m_aAsSequence = _rValues;
- m_bSequenceOutOfDate = sal_False;
+ m_bSequenceOutOfDate = false;
}
else
- m_bSequenceOutOfDate = sal_True;
+ m_bSequenceOutOfDate = true;
return bValidPropsOnly;
}
- sal_Bool ODADescriptorImpl::buildFrom( const Reference< XPropertySet >& _rxValues )
+ bool ODADescriptorImpl::buildFrom( const Reference< XPropertySet >& _rxValues )
{
Reference< XPropertySetInfo > xPropInfo;
if (_rxValues.is())
@@ -142,7 +142,7 @@ namespace svx
if (!xPropInfo.is())
{
OSL_FAIL("ODADescriptorImpl::buildFrom: invalid property set!");
- return sal_False;
+ return false;
}
// build a PropertyValue sequence with the current values
@@ -159,14 +159,14 @@ namespace svx
pValues->Value = _rxValues->getPropertyValue(pProperty->Name);
}
- sal_Bool bValidPropsOnly = buildFrom(aValues);
+ bool bValidPropsOnly = buildFrom(aValues);
if (bValidPropsOnly)
{
m_xAsSet = _rxValues;
- m_bSetOutOfDate = sal_False;
+ m_bSetOutOfDate = false;
}
else
- m_bSetOutOfDate = sal_True;
+ m_bSetOutOfDate = true;
return bValidPropsOnly;
}
@@ -174,8 +174,8 @@ namespace svx
void ODADescriptorImpl::invalidateExternRepresentations()
{
- m_bSetOutOfDate = sal_True;
- m_bSequenceOutOfDate = sal_True;
+ m_bSetOutOfDate = true;
+ m_bSequenceOutOfDate = true;
}
@@ -269,7 +269,7 @@ namespace svx
}
// don't need to rebuild next time
- m_bSequenceOutOfDate = sal_False;
+ m_bSequenceOutOfDate = false;
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a1ea29f2abd8..31c46c36e230 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1223,14 +1223,14 @@ namespace svxform
void XFormsPage::EnableMenuItems( Menu* _pMenu )
{
- sal_Bool bEnableAdd = sal_False;
- sal_Bool bEnableEdit = sal_False;
- sal_Bool bEnableRemove = sal_False;
+ bool bEnableAdd = false;
+ bool bEnableEdit = false;
+ bool bEnableRemove = false;
SvTreeListEntry* pEntry = m_aItemList.FirstSelected();
if ( pEntry )
{
- bEnableAdd = sal_True;
+ bEnableAdd = true;
bool bSubmitChild = false;
if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) )
{
@@ -1240,10 +1240,10 @@ namespace svxform
ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
{
- bEnableEdit = sal_True;
+ bEnableEdit = true;
bEnableRemove = ( bSubmitChild != true );
if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) )
- bEnableRemove = sal_False;
+ bEnableRemove = false;
if ( pNode->m_xNode.is() )
{
try
@@ -1252,7 +1252,7 @@ namespace svxform
if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE
&& eChildType != css::xml::dom::NodeType_DOCUMENT_NODE )
{
- bEnableAdd = sal_False;
+ bEnableAdd = false;
}
}
catch ( Exception& )
@@ -1263,7 +1263,7 @@ namespace svxform
}
}
else if ( m_eGroup != DGTInstance )
- bEnableAdd = sal_True;
+ bEnableAdd = true;
m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd );
m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd );
@@ -1471,7 +1471,7 @@ namespace svxform
if ( aDlg.Execute() == RET_OK )
{
OUString sNewName = aDlg.GetName();
- sal_Bool bDocumentData = aDlg.GetModifyDoc();
+ bool bDocumentData = aDlg.GetModifyDoc();
if ( m_aModelsBox.GetEntryPos( sNewName ) != LISTBOX_ENTRY_NOTFOUND )
{
@@ -1494,7 +1494,7 @@ namespace svxform
Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW );
xModelProps->setPropertyValue(
OUString( "ExternalData" ),
- makeAny( sal_Bool( !bDocumentData ) ) );
+ makeAny( !bDocumentData ) );
sal_Int32 nNewPos = m_aModelsBox.InsertEntry( sNewName );
m_aModelsBox.SelectEntryPos( nNewPos );
@@ -1521,10 +1521,10 @@ namespace svxform
Reference< css::xforms::XFormsSupplier > xFormsSupp( m_xFrameModel, UNO_QUERY_THROW );
Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW );
Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW );
- sal_Bool bExternalData = sal_False;
+ bool bExternalData = false;
OSL_VERIFY( xModelProps->getPropertyValue(
OUString( "ExternalData" ) ) >>= bExternalData );
- bDocumentData = ( bExternalData == sal_False );
+ bDocumentData = !bExternalData;
}
catch( const Exception& )
{
@@ -1544,7 +1544,7 @@ namespace svxform
Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW );
xModelProps->setPropertyValue(
OUString( "ExternalData" ),
- makeAny( sal_Bool( !bDocumentData ) ) );
+ makeAny( !bDocumentData ) );
bIsDocModified = true;
}
catch( const Exception& )
@@ -2936,7 +2936,7 @@ namespace svxform
IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, EMPTYARG )
{
- sal_Bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
+ bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
m_pEditNamespaceBtn->Enable( bEnable );
m_pDeleteNamespaceBtn->Enable( bEnable );
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index a22155887418..4d6c659e4837 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -180,7 +180,7 @@ namespace svxform
}
- Reference< XNumberFormatsSupplier > OStaticDataAccessTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const
+ Reference< XNumberFormatsSupplier > OStaticDataAccessTools::getNumberFormats(const Reference< XConnection>& _rxConn, bool _bAllowDefault) const
{
Reference< XNumberFormatsSupplier > xReturn;
if ( ensureLoaded() )
@@ -210,7 +210,7 @@ namespace svxform
Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet,
- const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection ) const
+ const Reference< XComponentContext >& _rxContext, bool _bSetAsActiveConnection ) const
SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
{
Reference< XConnection > xReturn;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index cca22caa5fdf..f3124dffe657 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -876,7 +876,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
}
-sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const
+bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const
{
FmFormItem* pFormItem = PTR_CAST( FmFormItem, pItem->GetParent()->GetParent() );
try
@@ -889,7 +889,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr
// obtain a number formatter for this connection
// TODO: shouldn't this be cached?
- Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, sal_True );
+ Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, true );
Reference< XNumberFormatter > xFormatter( NumberFormatter::create( comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
xFormatter->attachNumberFormatsSupplier( xFormatSupplier );
@@ -909,7 +909,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr
xParseNode->parseNodeToPredicateStr(
aPreparedText, xConnection, xFormatter, xField, OUString(), aAppLocale, '.', getParseContext() );
rText = aPreparedText;
- return sal_True;
+ return true;
}
}
catch( const Exception& )
@@ -917,7 +917,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr
DBG_UNHANDLED_EXCEPTION();
}
- return sal_False;
+ return false;
}
@@ -996,7 +996,7 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
{
// checks whether for each form there's one free level for input
::std::vector< FmFilterData* >& rChildren = _rItem.GetChildren();
- sal_Bool bAppendLevel = _rItem.ISA( FmFormItem );
+ bool bAppendLevel = _rItem.ISA( FmFormItem );
for ( ::std::vector<FmFilterData*>::iterator i = rChildren.begin();
i != rChildren.end();
@@ -1006,7 +1006,7 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
FmFilterItems* pItems = PTR_CAST(FmFilterItems, *i);
if ( pItems && pItems->GetChildren().empty() )
{
- bAppendLevel = sal_False;
+ bAppendLevel = false;
break;
}
@@ -1203,7 +1203,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
{
if (!IsExpanded(pEntry))
Expand(pEntry);
- Select(pEntry, sal_True);
+ Select(pEntry, true);
}
}
}
@@ -1320,12 +1320,12 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
}
else
{
- sal_Bool bNeedTrigger = sal_False;
+ bool bNeedTrigger = false;
// auf dem ersten Eintrag ?
if ((aDropPos.Y() >= 0) && (aDropPos.Y() < GetEntryHeight()))
{
m_aDropActionType = DA_SCROLLUP;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
}
else
{
@@ -1334,7 +1334,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight()))
{
m_aDropActionType = DA_SCROLLDOWN;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
}
else
{ // is it an entry with children, and not yet expanded?
@@ -1343,7 +1343,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
{
// -> aufklappen
m_aDropActionType = DA_EXPANDNODE;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
}
}
}
@@ -1434,7 +1434,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
FmFilterItems* pTargetItems = getTargetItems(pDropTarget);
SelectAll(false);
SvTreeListEntry* pEntry = FindEntry(pTargetItems);
- Select(pEntry, sal_True);
+ Select(pEntry, true);
SetCurEntry(pEntry);
insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY == rEvt.mnAction);
@@ -1462,10 +1462,10 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
}
-sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
+bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, bool bSelect )
{
- if (bSelect == (IsSelected(pEntry) ? 1 : 0)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
- return sal_True;
+ if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
+ return true;
if (SvTreeListBox::Select(pEntry, bSelect))
{
@@ -1490,10 +1490,10 @@ sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
m_pModel->SetCurrentController(((FmFormItem*)pEntry->GetUserData())->GetController());
}
}
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
@@ -1576,8 +1576,8 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
// be sure that the data is only used within only one form!
FmFormItem* pFirstItem = NULL;
- sal_Bool bHandled = sal_True;
- sal_Bool bFoundSomething = sal_False;
+ bool bHandled = true;
+ bool bFoundSomething = false;
for (SvTreeListEntry* pEntry = FirstSelected();
bHandled && pEntry != NULL;
pEntry = NextSelected(pEntry))
@@ -1587,16 +1587,16 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
{
FmFormItem* pForm = PTR_CAST(FmFormItem,pFilter->GetParent()->GetParent());
if (!pForm)
- bHandled = sal_False;
+ bHandled = false;
else if (!pFirstItem)
pFirstItem = pForm;
else if (pFirstItem != pForm)
- bHandled = sal_False;
+ bHandled = false;
if (bHandled)
{
_rItemList.push_back(pFilter);
- bFoundSomething = sal_True;
+ bFoundSomething = true;
}
}
}
@@ -1605,7 +1605,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
return pFirstItem;
}
-void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy)
+void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,bool _bCopy)
{
::std::vector<FmFilterItem*>::const_iterator aEnd = _rFilterList.end();
for ( ::std::vector< FmFilterItem* >::const_iterator i = _rFilterList.begin();
@@ -1655,7 +1655,7 @@ void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
void FmFilterNavigator::Command( const CommandEvent& rEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
switch (rEvt.GetCommand())
{
case COMMAND_CONTEXTMENU:
@@ -1673,7 +1673,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
if (!IsSelected(pClicked))
{
SelectAll(false);
- Select(pClicked, sal_True);
+ Select(pClicked, true);
SetCurEntry(pClicked);
}
}
@@ -1710,7 +1710,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
aContextMenu.EnableItem( SID_FM_DELETE, !aSelectList.empty() );
- sal_Bool bEdit = PTR_CAST(FmFilterItem, (FmFilterData*)pClicked->GetUserData()) != NULL &&
+ bool bEdit = PTR_CAST(FmFilterItem, (FmFilterData*)pClicked->GetUserData()) != NULL &&
IsSelected(pClicked) && GetSelectionCount() == 1;
aContextMenu.EnableItem( SID_FM_FILTER_EDIT,
@@ -1747,7 +1747,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
DeleteSelection();
} break;
}
- bHandled = sal_True;
+ bHandled = true;
} break;
}
@@ -1809,7 +1809,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
break;
::std::vector<FmFilterItem*>::const_iterator aEnd = aItemList.end();
- sal_Bool bNextTargetItem = sal_True;
+ bool bNextTargetItem = true;
while ( bNextTargetItem )
{
::std::vector<FmFilterItem*>::const_iterator i = aItemList.begin();
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 01fa034a6977..dbe759e29791 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -194,7 +194,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings*
SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo )
:SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) )
,SfxControllerItem(SID_FM_PROPERTY_CONTROL, *_pBindings)
- ,m_bInitialStateChange(sal_True)
+ ,m_bInitialStateChange(true)
,m_bInStateChange( false )
,m_xORB(_xORB)
{
@@ -361,7 +361,7 @@ bool FmPropBrw::Close()
// 10/19/00 - 79321 - FS
SfxBindings& rBindings = SfxControllerItem::GetBindings();
- sal_Bool bClose = SfxFloatingWindow::Close();
+ bool bClose = SfxFloatingWindow::Close();
if (bClose)
{
@@ -462,16 +462,16 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
aConstrainedSize.setWidth( aMinSize.Width );
SetMinOutputSizePixel( aConstrainedSize );
aConstrainedSize = GetOutputSizePixel();
- sal_Bool bResize = sal_False;
+ bool bResize = false;
if( aConstrainedSize.Width() < aMinSize.Width )
{
aConstrainedSize.setWidth( aMinSize.Width );
- bResize = sal_True;
+ bResize = true;
}
if( aConstrainedSize.Height() < aMinSize.Height )
{
aConstrainedSize.setHeight( aMinSize.Height );
- bResize = sal_True;
+ bResize = true;
}
if( bResize )
SetOutputSizePixel( aConstrainedSize );
@@ -667,7 +667,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool
}
}
- m_bInitialStateChange = sal_False;
+ m_bInitialStateChange = false;
}
}
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 2e5a341a1a26..ca6c1fd76f3b 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -109,7 +109,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
// XFormsSupplier2
sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
- sal_Bool bHas = sal_False;
+ bool bHas = false;
FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetSdrPage() );
if ( pFormPage )
bHas = pFormPage->GetForms( false ).is();
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 69e5ae3282d7..ba3c2d6d8833 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -41,8 +41,8 @@ namespace svxform
OLocalExchange::OLocalExchange( )
- :m_bDragging( sal_False )
- ,m_bClipboardOwner( sal_False )
+ :m_bDragging( false )
+ ,m_bClipboardOwner( false )
{
}
@@ -55,7 +55,7 @@ namespace svxform
m_aClipboardListener.Call( this );
}
- m_bClipboardOwner = sal_True;
+ m_bClipboardOwner = true;
CopyToClipboard( _pWindow );
}
@@ -74,7 +74,7 @@ namespace svxform
{
DBG_UNHANDLED_EXCEPTION();
}
- m_bClipboardOwner = sal_False;
+ m_bClipboardOwner = false;
}
}
@@ -82,7 +82,7 @@ namespace svxform
void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException, std::exception)
{
TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans );
- m_bClipboardOwner = sal_False;
+ m_bClipboardOwner = false;
if ( m_aClipboardListener.IsSet() )
m_aClipboardListener.Call( this );
@@ -91,7 +91,7 @@ namespace svxform
void OLocalExchange::startDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& )
{
- m_bDragging = sal_True;
+ m_bDragging = true;
StartDrag( _pWindow, _nDragSourceActions );
}
@@ -99,11 +99,11 @@ namespace svxform
void OLocalExchange::DragFinished( sal_Int8 nDropAction )
{
TransferableHelper::DragFinished( nDropAction );
- m_bDragging = sal_False;
+ m_bDragging = false;
}
- sal_Bool OLocalExchange::hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId )
+ bool OLocalExchange::hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId )
{
DataFlavorExVector::const_iterator aSearch;
@@ -162,7 +162,7 @@ namespace svxform
}
- static sal_Bool lcl_fillDataFlavorEx( SotFormatStringId nId, DataFlavorEx& _rFlavor )
+ static bool lcl_fillDataFlavorEx( SotFormatStringId nId, DataFlavorEx& _rFlavor )
{
_rFlavor.mnSotId = nId;
return SotExchange::GetFormatDataFlavor( _rFlavor.mnSotId, _rFlavor );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index c1ab382555f3..2e9fbed07ef0 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -269,30 +269,30 @@ void FmEntryData::Clear()
}
-sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
+bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
if(this == pEntryData)
- return sal_True;
+ return true;
if( !pEntryData )
- return sal_False;
+ return false;
if( !aText.equals(pEntryData->GetText()))
- return sal_False;
+ return false;
if( !pEntryData->GetParent() && pParent )
- return sal_False;
+ return false;
if( pEntryData->GetParent() && !pParent )
- return sal_False;
+ return false;
if( !pEntryData->GetParent() && !pParent )
- return sal_True;
+ return true;
if( !pParent->IsEqualWithoutChildren(pEntryData->GetParent()) )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
@@ -348,15 +348,15 @@ FmEntryData* FmFormData::Clone()
}
-sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
+bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
if(this == pEntryData)
- return sal_True;
+ return true;
if( !pEntryData->ISA(FmFormData) )
- return sal_False;
+ return false;
FmFormData* pFormData = (FmFormData*)pEntryData;
if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() )
- return sal_False;
+ return false;
return FmEntryData::IsEqualWithoutChildren( pFormData );
}
@@ -515,17 +515,17 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
}
-sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
+bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
if(this == pEntryData)
- return sal_True;
+ return true;
if( !pEntryData->ISA(FmControlData) )
- return sal_False;
+ return false;
FmControlData* pControlData = (FmControlData*)pEntryData;
if( (XFormComponent*)m_xFormComponent.get() != (XFormComponent*)pControlData->GetFormComponent().get() )
- return sal_False;
+ return false;
return FmEntryData::IsEqualWithoutChildren( pControlData );
}
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 8d60b3f567e9..5b13593a1605 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -39,15 +39,15 @@ TYPEINIT1(FmFormModel, SdrModel);
struct FmFormModelImplData
{
FmXUndoEnvironment* pUndoEnv;
- sal_Bool bOpenInDesignIsDefaulted;
- sal_Bool bMovingPage;
+ bool bOpenInDesignIsDefaulted;
+ bool bMovingPage;
::boost::optional< sal_Bool >
aControlsUseRefDevice;
FmFormModelImplData()
:pUndoEnv( NULL )
- ,bOpenInDesignIsDefaulted( sal_True )
- ,bMovingPage( sal_False )
+ ,bOpenInDesignIsDefaulted( true )
+ ,bMovingPage( false )
,aControlsUseRefDevice()
{
}
@@ -155,12 +155,12 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
\************************************************************************/
void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
{
- m_pImpl->bMovingPage = sal_True;
+ m_pImpl->bMovingPage = true;
// see InsertPage for this
SdrModel::MovePage( nPgNum, nNewPos );
- m_pImpl->bMovingPage = sal_False;
+ m_pImpl->bMovingPage = false;
}
/*************************************************************************
@@ -235,7 +235,7 @@ void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce )
m_pObjShell->SetModified( true );
}
// no matter if we really did it or not - from now on, it does not count as defaulted anymore
- m_pImpl->bOpenInDesignIsDefaulted = sal_False;
+ m_pImpl->bOpenInDesignIsDefaulted = false;
}
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index fff119d0efcd..0c65ee2b4c1e 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -487,12 +487,12 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
sal_Int16 nCurrentSourceIndex = 0, nCurrentDestIndex = 0;
while (nCurrentSourceIndex <= nIndex)
{
- sal_Bool bEqualDSS = sal_False;
+ bool bEqualDSS = false;
while (!bEqualDSS) // (we don't have to check nCurrentSourceIndex here : it's bound by nIndex)
{
xSourceContainer->getByIndex(nCurrentSourceIndex) >>= xCurrentSourceForm;
DBG_ASSERT(xCurrentSourceForm.is(), "FmFormObj::ensureModelEnv : invalid form ancestor (2) !");
- bEqualDSS = sal_False;
+ bEqualDSS = false;
if (::comphelper::hasProperty(FM_PROP_DATASOURCE, xCurrentSourceForm))
{ // it is a form
try
@@ -502,7 +502,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
&& ::comphelper::compare(xCurrentSourceForm->getPropertyValue(FM_PROP_DATASOURCE), aSrcDataSource)
)
{
- bEqualDSS = sal_True;
+ bEqualDSS = true;
}
}
catch(Exception&)
@@ -518,12 +518,12 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
// ??? at least the nIndex-th one should have been found ???
// now search the next one with the given DSS (within the destination container)
- bEqualDSS = sal_False;
+ bEqualDSS = false;
while (!bEqualDSS && (nCurrentDestIndex < xDestContainer->getCount()))
{
xDestContainer->getByIndex(nCurrentDestIndex) >>= xCurrentDestForm;
DBG_ASSERT(xCurrentDestForm.is(), "FmFormObj::ensureModelEnv : invalid destination form !");
- bEqualDSS = sal_False;
+ bEqualDSS = false;
if (::comphelper::hasProperty(FM_PROP_DATASOURCE, xCurrentDestForm))
{ // it is a form
try
@@ -533,7 +533,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
&& ::comphelper::compare(xCurrentDestForm->getPropertyValue(FM_PROP_DATASOURCE), aSrcDataSource)
)
{
- bEqualDSS = sal_True;
+ bEqualDSS = true;
}
}
catch(Exception&)
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 8a6eca456092..8c00e5e0899f 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::svxform;
-static sal_Bool bInit = sal_False;
+static bool bInit = false;
/*************************************************************************
|*
@@ -86,7 +86,7 @@ FmFormObjFactory::FmFormObjFactory()
FmFormShell::RegisterInterface(0);
ImplSmartRegisterUnoServices();
- bInit = sal_True;
+ bInit = true;
}
}
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 8ea69d36139e..c49fc2cdc041 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -68,7 +68,7 @@ using namespace ::svxform;
FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
:m_rPage( _rPage )
- ,m_bFirstActivation( sal_True )
+ ,m_bFirstActivation( true )
,m_bAttemptedFormCreation( false )
,m_bInFind( false )
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 12132a2730bd..3cfc42c4d196 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -273,7 +273,7 @@ bool FmFormShell::PrepareClose(bool bUI)
const ::svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures();
if ( rController->commitCurrentControl() )
{
- sal_Bool bModified = rController->isModifiedRow();
+ bool bModified = rController->isModifiedRow();
if ( bModified && bUI )
{
@@ -281,8 +281,8 @@ bool FmFormShell::PrepareClose(bool bUI)
switch (aQry.Execute())
{
case RET_NO:
- bModified = sal_False;
- GetImpl()->didPrepareClose( sal_True );
+ bModified = false;
+ GetImpl()->didPrepareClose( true );
break;
case RET_CANCEL:
@@ -609,7 +609,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_SHOW_PROPERTY_BROWSER:
{
SFX_REQUEST_ARG( rReq, pShowItem, SfxBoolItem, SID_FM_SHOW_PROPERTIES, false );
- sal_Bool bShow = sal_True;
+ bool bShow = true;
if ( pShowItem )
bShow = pShowItem->GetValue();
GetImpl()->ShowSelectionProperties( bShow );
@@ -621,7 +621,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
{
// PropertyBrowser anzeigen
SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false);
- sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
+ bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
InterfaceBag aOnlyTheForm;
aOnlyTheForm.insert( Reference< XInterface >( GetImpl()->getCurrentForm(), UNO_QUERY ) );
@@ -635,7 +635,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_CTL_PROPERTIES:
{
SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false);
- sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
+ bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" );
if ( bShow )
@@ -777,8 +777,8 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_FILTER_EXECUTE:
case SID_FM_FILTER_EXIT:
{
- sal_Bool bCancelled = ( SID_FM_FILTER_EXIT == nSlot );
- sal_Bool bReopenNavigator = sal_False;
+ bool bCancelled = ( SID_FM_FILTER_EXIT == nSlot );
+ bool bReopenNavigator = false;
if ( !bCancelled )
{
@@ -788,7 +788,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
if ( GetViewShell()->GetViewFrame()->HasChildWindow( SID_FM_FILTER_NAVIGATOR ) )
{
GetViewShell()->GetViewFrame()->ToggleChildWindow( SID_FM_FILTER_NAVIGATOR );
- bReopenNavigator = sal_True;
+ bReopenNavigator = true;
}
Reference< runtime::XFormController > xController( GetImpl()->getActiveController() );
@@ -906,7 +906,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
else
{
- sal_Bool bLayerLocked = sal_False;
+ bool bLayerLocked = false;
if (m_pFormView)
{
// Ist der ::com::sun::star::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897
@@ -959,7 +959,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
case SID_FM_SHOW_PROPERTY_BROWSER:
{
- rSet.Put(SfxBoolItem(GetImpl()->IsPropBrwOpen()));
+ rSet.Put(SfxBoolItem(nWhich, GetImpl()->IsPropBrwOpen()));
}
break;
@@ -968,13 +968,13 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(sal_False);
+ GetImpl()->ForceUpdateSelection(false);
if ( !m_pFormView || !m_bDesignMode || !GetImpl()->onlyControlsAreMarked() )
rSet.DisableItem( nWhich );
else
{
- sal_Bool bChecked = GetImpl()->IsPropBrwOpen() && !GetImpl()->isSolelySelected( GetImpl()->getCurrentForm() );
+ bool bChecked = GetImpl()->IsPropBrwOpen() && !GetImpl()->isSolelySelected( GetImpl()->getCurrentForm() );
// if the property browser is open, and only controls are marked, and the current selection
// does not consist of only the current form, then the current selection is the (composition of)
// the currently marked controls
@@ -987,13 +987,13 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(sal_False);
+ GetImpl()->ForceUpdateSelection(false);
if ( !m_pFormView || !m_bDesignMode || !GetImpl()->getCurrentForm().is() )
rSet.DisableItem( nWhich );
else
{
- sal_Bool bChecked = GetImpl()->IsPropBrwOpen() && GetImpl()->isSolelySelected( GetImpl()->getCurrentForm() );
+ bool bChecked = GetImpl()->IsPropBrwOpen() && GetImpl()->isSolelySelected( GetImpl()->getCurrentForm() );
rSet.Put(SfxBoolItem(nWhich, bChecked));
}
} break;
@@ -1001,7 +1001,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(sal_False);
+ GetImpl()->ForceUpdateSelection(false);
if (!m_pFormView || !m_bDesignMode || !GetImpl()->getCurrentForm().is() )
rSet.DisableItem( nWhich );
@@ -1099,7 +1099,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
rSet.DisableItem(nWhich);
else
{
- sal_Bool bEnable = sal_False;
+ bool bEnable = false;
try
{
switch (nWhich)
@@ -1107,8 +1107,8 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
case SID_FM_VIEW_AS_GRID:
if (GetImpl()->getHostFrame().is() && GetImpl()->getNavController().is())
{
- bEnable = sal_True;
- sal_Bool bDisplayingCurrent =
+ bEnable = true;
+ bool bDisplayingCurrent =
GetImpl()->getInternalForm(
Reference< XForm >( GetImpl()->getNavController()->getModel(), UNO_QUERY )
) == GetImpl()->getExternallyDisplayedForm();
@@ -1256,7 +1256,7 @@ void FmFormShell::Activate(bool bMDI)
SfxShell::Activate(bMDI);
if ( m_pFormView )
- GetImpl()->viewActivated( *m_pFormView, sal_True );
+ GetImpl()->viewActivated( *m_pFormView, true );
}
@@ -1265,7 +1265,7 @@ void FmFormShell::Deactivate(bool bMDI)
SfxShell::Deactivate(bMDI);
if ( m_pFormView )
- GetImpl()->viewDeactivated( *m_pFormView, sal_False );
+ GetImpl()->viewDeactivated( *m_pFormView, false );
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index f421fd809159..5e3aceaa2ae3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -556,13 +556,13 @@ bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>
}
-sal_Bool isControlList(const SdrMarkList& rMarkList)
+bool isControlList(const SdrMarkList& rMarkList)
{
// enthaelt die liste nur Controls und mindestens ein control
sal_uInt32 nMarkCount = rMarkList.GetMarkCount();
- sal_Bool bControlList = nMarkCount != 0;
+ bool bControlList = nMarkCount != 0;
- sal_Bool bHadAnyLeafs = sal_False;
+ bool bHadAnyLeafs = false;
for (sal_uInt32 i = 0; i < nMarkCount && bControlList; i++)
{
@@ -584,12 +584,12 @@ sal_Bool isControlList(const SdrMarkList& rMarkList)
while (aIter.IsMore() && bControlList)
{
bControlList = FmFormInventor == aIter.Next()->GetObjInventor();
- bHadAnyLeafs = sal_True;
+ bHadAnyLeafs = true;
}
}
else
{
- bHadAnyLeafs = sal_True;
+ bHadAnyLeafs = true;
bControlList = FmFormInventor == pObj->GetObjInventor();
}
}
@@ -647,16 +647,16 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
,m_aNavControllerFeatures( this )
,m_eDocumentType( eUnknownDocumentType )
,m_nLockSlotInvalidation( 0 )
- ,m_bHadPropertyBrowserInDesignMode( sal_False )
- ,m_bTrackProperties( sal_True )
- ,m_bUseWizards( sal_True )
- ,m_bDatabaseBar( sal_False )
- ,m_bInActivate( sal_False )
- ,m_bSetFocus( sal_False )
- ,m_bFilterMode( sal_False )
- ,m_bChangingDesignMode( sal_False )
- ,m_bPreparedClose( sal_False )
- ,m_bFirstActivation( sal_True )
+ ,m_bHadPropertyBrowserInDesignMode( false )
+ ,m_bTrackProperties( true )
+ ,m_bUseWizards( true )
+ ,m_bDatabaseBar( false )
+ ,m_bInActivate( false )
+ ,m_bSetFocus( false )
+ ,m_bFilterMode( false )
+ ,m_bChangingDesignMode( false )
+ ,m_bPreparedClose( false )
+ ,m_bFirstActivation( true )
{
m_aMarkTimer.SetTimeout(100);
m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut));
@@ -804,7 +804,7 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept
m_xExternalDisplayedForm = NULL;
m_xExtViewTriggerController = NULL;
- InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False );
+ InvalidateSlot( SID_FM_VIEW_AS_GRID, false );
}
}
@@ -832,16 +832,16 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
else
{
// with the following the slot is invalidated asynchron
- LockSlotInvalidation(sal_True);
- InvalidateSlot(SID_FM_RECORD_TOTAL, sal_False);
- LockSlotInvalidation(sal_False);
+ LockSlotInvalidation(true);
+ InvalidateSlot(SID_FM_RECORD_TOTAL, false);
+ LockSlotInvalidation(false);
}
}
// this may be called from a non-main-thread so invalidate the shell asynchronously
- LockSlotInvalidation(sal_True);
- InvalidateSlot(0, 0); // special meaning : invalidate m_pShell
- LockSlotInvalidation(sal_False);
+ LockSlotInvalidation(true);
+ InvalidateSlot(0, false); // special meaning : invalidate m_pShell
+ LockSlotInvalidation(false);
}
@@ -902,7 +902,7 @@ void FmXFormShell::disposing()
FmXFormShell_BASE::disposing();
if ( m_pShell && !m_pShell->IsDesignMode() )
- setActiveController( NULL, sal_True );
+ setActiveController( NULL, true );
// do NOT save the content of the old form (the second parameter tells this)
// if we're here, then we expect that PrepareClose has been called, and thus the user
// got a chance to commit or reject any changes. So in case we're here and there
@@ -981,7 +981,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
if ( m_nLockSlotInvalidation )
{
OSL_FAIL( "FmXFormShell::UpdateSlot: cannot update if invalidation is currently locked!" );
- InvalidateSlot( _nId, sal_False );
+ InvalidateSlot( _nId, false );
}
else
{
@@ -992,7 +992,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
}
-void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
+void FmXFormShell::InvalidateSlot( sal_Int16 nId, bool bWithId )
{
if ( impl_checkDisposed() )
return;
@@ -1011,7 +1011,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
}
-void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
+void FmXFormShell::LockSlotInvalidation(bool bLock)
{
if ( impl_checkDisposed() )
return;
@@ -1050,7 +1050,7 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
}
-void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
+void FmXFormShell::ForceUpdateSelection(bool bAllowInvalidation)
{
if ( impl_checkDisposed() )
return;
@@ -1061,12 +1061,12 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
// die Invalidierung der Slots, die implizit von SetSelection besorgt wird, eventuell abschalten
if (!bAllowInvalidation)
- LockSlotInvalidation(sal_True);
+ LockSlotInvalidation(true);
SetSelection(m_pShell->GetFormView()->GetMarkedObjectList());
if (!bAllowInvalidation)
- LockSlotInvalidation(sal_False);
+ LockSlotInvalidation(false);
}
}
@@ -1623,24 +1623,24 @@ void FmXFormShell::ExecuteSearch()
}
-sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
+bool FmXFormShell::GetY2KState(sal_uInt16& n)
{
if ( impl_checkDisposed() )
- return sal_False;
+ return false;
if (m_pShell->IsDesignMode())
// im Design-Modus (ohne aktive Controls) soll sich das Haupt-Dokument darum kuemmern
- return sal_False;
+ return false;
Reference< XForm> xForm( getActiveForm());
if (!xForm.is())
// kein aktuelles Formular (also insbesondere kein aktuelles Control) -> das Haupt-Dokument soll sich kuemmern
- return sal_False;
+ return false;
Reference< XRowSet> xDB(xForm, UNO_QUERY);
DBG_ASSERT(xDB.is(), "FmXFormShell::GetY2KState : current form has no dbform-interface !");
- Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(OStaticDataAccessTools().getRowSetConnection(xDB), sal_False));
+ Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(OStaticDataAccessTools().getRowSetConnection(xDB), false));
if (xSupplier.is())
{
Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings());
@@ -1650,7 +1650,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
{
Any aVal( xSet->getPropertyValue("TwoDigitDateStart") );
aVal >>= n;
- return sal_True;
+ return true;
}
catch(Exception&)
{
@@ -1658,7 +1658,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
}
}
- return sal_False;
+ return false;
}
@@ -1671,7 +1671,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
Reference< XRowSet > xActiveRowSet( xActiveForm, UNO_QUERY );
if ( xActiveRowSet.is() )
{
- Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xActiveRowSet ), sal_False ) );
+ Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xActiveRowSet ), false ) );
if (xSupplier.is())
{
Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings());
@@ -1711,7 +1711,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
Reference< XRowSet> xElementAsRowSet( xCurrentElement, UNO_QUERY );
if ( xElementAsRowSet.is() )
{
- Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xElementAsRowSet ), sal_False ) );
+ Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getRowSetConnection( xElementAsRowSet ), false ) );
if (!xSupplier.is())
continue;
@@ -1863,7 +1863,7 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
}
-void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent )
+void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, bool _bNoSaveOldContent )
{
if ( impl_checkDisposed() )
return;
@@ -1889,7 +1889,7 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
xNavigationForm = Reference< XResultSet>(m_xNavigationController->getModel(), UNO_QUERY);
aGuard.clear();
- m_bInActivate = sal_True;
+ m_bInActivate = true;
// check if the 2 controllers serve different forms
Reference< XResultSet> xOldForm;
@@ -1911,11 +1911,11 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
// wurde bereits ausgefuehrt
if ( m_aActiveControllerFeatures->commitCurrentControl() )
{
- m_bSetFocus = sal_True;
+ m_bSetFocus = true;
if ( m_aActiveControllerFeatures->isModifiedRow() )
{
- sal_Bool bIsNew = m_aActiveControllerFeatures->isInsertionRow();
- sal_Bool bResult = m_aActiveControllerFeatures->commitCurrentRecord();
+ bool bIsNew = m_aActiveControllerFeatures->isInsertionRow();
+ bool bResult = m_aActiveControllerFeatures->commitCurrentRecord();
if ( !bResult && m_bSetFocus )
{
// if we couldn't save the current record, set the focus back to the
@@ -1923,7 +1923,7 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
Reference< XWindow > xWindow( m_xActiveController->getCurrentControl(), UNO_QUERY );
if ( xWindow.is() )
xWindow->setFocus();
- m_bInActivate = sal_False;
+ m_bInActivate = false;
return;
}
else if ( bResult && bIsNew )
@@ -1961,12 +1961,12 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
if (m_xNavigationController.is())
xNavigationForm = Reference< XResultSet>(m_xNavigationController->getModel(), UNO_QUERY);
- m_bInActivate = sal_False;
+ m_bInActivate = false;
m_pShell->UIFeatureChanged();
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
- InvalidateSlot(SID_FM_FILTER_NAVIGATOR_CONTROL, sal_True);
+ InvalidateSlot(SID_FM_FILTER_NAVIGATOR_CONTROL, true);
}
}
@@ -2069,7 +2069,7 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
// ensure some slots are updated
for ( size_t i = 0; i < sizeof( SelObjectSlotMap ) / sizeof( SelObjectSlotMap[0] ); ++i )
- InvalidateSlot( SelObjectSlotMap[i], sal_False);
+ InvalidateSlot( SelObjectSlotMap[i], false);
return true;
}
@@ -2109,7 +2109,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo
// ensure the UI which depends on the current form is up-to-date
for ( size_t i = 0; i < sizeof( DlgSlotMap ) / sizeof( DlgSlotMap[0] ); ++i )
- InvalidateSlot( DlgSlotMap[i], sal_False );
+ InvalidateSlot( DlgSlotMap[i], false );
}
@@ -2131,7 +2131,7 @@ void FmXFormShell::startListening()
OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND));
if (!aSource.isEmpty())
{
- m_bDatabaseBar = sal_True;
+ m_bDatabaseBar = true;
xActiveFormSet->getPropertyValue(FM_PROP_NAVIGATION) >>= m_eNavigate;
@@ -2166,7 +2166,7 @@ void FmXFormShell::startListening()
default:
m_xNavigationController = NULL;
- m_bDatabaseBar = sal_False;
+ m_bDatabaseBar = false;
}
m_aNavControllerFeatures.dispose();
@@ -2187,7 +2187,7 @@ void FmXFormShell::startListening()
}
m_eNavigate = NavigationBarMode_NONE;
- m_bDatabaseBar = sal_False;
+ m_bDatabaseBar = false;
m_xNavigationController = NULL;
}
@@ -2209,19 +2209,19 @@ void FmXFormShell::stopListening()
}
}
- m_bDatabaseBar = sal_False;
+ m_bDatabaseBar = false;
m_eNavigate = NavigationBarMode_NONE;
m_xNavigationController = NULL;
}
-void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
+void FmXFormShell::ShowSelectionProperties( bool bShow )
{
if ( impl_checkDisposed() )
return;
// if the window is already visible, only update the state
- sal_Bool bHasChild = m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow( SID_FM_SHOW_PROPERTIES );
+ bool bHasChild = m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow( SID_FM_SHOW_PROPERTIES );
if ( bHasChild && bShow )
UpdateSlot( SID_FM_PROPERTY_CONTROL );
@@ -2229,8 +2229,8 @@ void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
else
m_pShell->GetViewShell()->GetViewFrame()->ToggleChildWindow(SID_FM_SHOW_PROPERTIES);
- InvalidateSlot( SID_FM_PROPERTIES, sal_False );
- InvalidateSlot( SID_FM_CTL_PROPERTIES, sal_False );
+ InvalidateSlot( SID_FM_PROPERTIES, false );
+ InvalidateSlot( SID_FM_CTL_PROPERTIES, false );
}
@@ -2279,7 +2279,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
if (m_xLastGridFound.is() && (m_xLastGridFound != xControlModel))
{
Reference< XPropertySet> xOldSet(m_xLastGridFound, UNO_QUERY);
- xOldSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, makeAny( (sal_Bool)sal_False ) );
+ xOldSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, makeAny( false ) );
Reference< XPropertyState> xOldSetState(xOldSet, UNO_QUERY);
if (xOldSetState.is())
xOldSetState->setPropertyToDefault(FM_PROP_CURSORCOLOR);
@@ -2299,7 +2299,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
// enable a permanent cursor for the grid so we can see the found text
Reference< XPropertySet> xModelSet(xControlModel, UNO_QUERY);
DBG_ASSERT(xModelSet.is(), "FmXFormShell::OnFoundData : invalid control model (no property set) !");
- xModelSet->setPropertyValue( FM_PROP_ALWAYSSHOWCURSOR, makeAny( (sal_Bool)sal_True ) );
+ xModelSet->setPropertyValue( FM_PROP_ALWAYSSHOWCURSOR, makeAny( true ) );
xModelSet->setPropertyValue( FM_PROP_CURSORCOLOR, makeAny( sal_Int32( COL_LIGHTRED ) ) );
m_xLastGridFound = xControlModel;
@@ -2589,7 +2589,7 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s
}
-void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
+void FmXFormShell::UpdateForms( bool _bInvalidate )
{
if ( impl_checkDisposed() )
return;
@@ -2693,18 +2693,18 @@ void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun:
if ( !xSelObj.is() )
return;
- EnableTrackProperties(sal_False);
+ EnableTrackProperties(false);
- sal_Bool bMarkChanged = m_pShell->GetFormView()->checkUnMarkAll(rEvent.Source);
+ bool bMarkChanged = m_pShell->GetFormView()->checkUnMarkAll(rEvent.Source);
Reference< XForm > xNewForm( GetForm( rEvent.Source ) );
InterfaceBag aNewSelection;
aNewSelection.insert( xSelObj );
if ( setCurrentSelection( aNewSelection ) && IsPropBrwOpen() )
- ShowSelectionProperties( sal_True );
+ ShowSelectionProperties( true );
- EnableTrackProperties(sal_True);
+ EnableTrackProperties(true);
if ( bMarkChanged )
m_pShell->NotifyMarkListChanged( m_pShell->GetFormView() );
@@ -2746,14 +2746,14 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
{
if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() )
- ShowSelectionProperties( sal_True );
+ ShowSelectionProperties( true );
}
-sal_Bool FmXFormShell::IsPropBrwOpen() const
+bool FmXFormShell::IsPropBrwOpen() const
{
if ( impl_checkDisposed() )
- return sal_False;
+ return false;
return( ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) ?
m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False );
@@ -2773,7 +2773,7 @@ public:
{
if ( m_rShell.IsTrackPropertiesEnabled() )
{
- m_rShell.EnableTrackProperties( sal_False );
+ m_rShell.EnableTrackProperties( false );
m_bEnabled = true;
}
}
@@ -2781,7 +2781,7 @@ public:
~SuspendPropertyTracking( )
{
if ( m_bEnabled ) // note that ( false != m_bEnabled ) implies ( NULL != m_pShell )
- m_rShell.EnableTrackProperties( sal_True );
+ m_rShell.EnableTrackProperties( true );
}
};
@@ -2792,7 +2792,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
return;
DBG_ASSERT(m_pShell->GetFormView(), "FmXFormShell::SetDesignMode : invalid call (have no shell or no view) !");
- m_bChangingDesignMode = sal_True;
+ m_bChangingDesignMode = true;
// 67506 - 15.07.99 - FS
// if we're switching off the design mode we have to force the property browser to be closed
@@ -2809,7 +2809,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
{
// we are currently filtering, so stop filtering
if (m_bFilterMode)
- stopFiltering(sal_False);
+ stopFiltering(false);
// unsubscribe from the objects of my MarkList
pFormView->GetImpl()->stopMarkListWatching();
@@ -2819,7 +2819,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
m_aMarkTimer.Stop();
SuspendPropertyTracking aSuspend( *this );
- pFormView->GetImpl()->saveMarkList( sal_True );
+ pFormView->GetImpl()->saveMarkList( true );
}
if (bDesign && m_xExternalViewController.is())
@@ -2832,7 +2832,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
m_pShell->Broadcast(aChangedHint);
m_pShell->m_bDesignMode = bDesign;
- UpdateForms( sal_False );
+ UpdateForms( false );
m_pTextShell->designModeChanged( m_pShell->m_bDesignMode );
@@ -2868,7 +2868,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
// (And that's why this has to be done AFTER the UIFeatureChanged.)
m_pShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON );
}
- m_bChangingDesignMode = sal_False;
+ m_bChangingDesignMode = false;
}
@@ -3005,7 +3005,7 @@ void FmXFormShell::startFiltering()
}
}
- m_bFilterMode = sal_True;
+ m_bFilterMode = true;
m_pShell->UIFeatureChanged();
SfxViewFrame* pViewFrame = m_pShell->GetViewShell()->GetViewFrame();
@@ -3038,7 +3038,7 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController)
{
xFormAsSet->setPropertyValue(FM_PROP_FILTER, xControllerAsSet->getPropertyValue(FM_PROP_FILTER));
- xFormAsSet->setPropertyValue(FM_PROP_APPLYFILTER, makeAny( (sal_Bool)sal_True ) );
+ xFormAsSet->setPropertyValue(FM_PROP_APPLYFILTER, makeAny( true ) );
}
catch (const Exception& )
{
@@ -3048,12 +3048,12 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController)
}
-void FmXFormShell::stopFiltering(sal_Bool bSave)
+void FmXFormShell::stopFiltering(bool bSave)
{
if ( impl_checkDisposed() )
return;
- m_bFilterMode = sal_False;
+ m_bFilterMode = false;
FmXFormView* pXView = m_pShell->GetFormView()->GetImpl();
@@ -3132,7 +3132,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
if (!isRowSetAlive(xFormSet))
{ // something went wrong -> restore the original state
OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ];
- sal_Bool bOriginalApplyFlag = aOriginalApplyFlags[ j - rControllers.begin() ];
+ bool bOriginalApplyFlag = aOriginalApplyFlags[ j - rControllers.begin() ];
try
{
xFormSet->setPropertyValue(FM_PROP_FILTER, makeAny(sOriginalFilter));
@@ -3161,7 +3161,7 @@ void FmXFormShell::CreateExternalView()
DBG_ASSERT(m_xAttachedFrame.is(), "FmXFormShell::CreateExternalView : no frame !");
// the frame the external view is displayed in
- sal_Bool bAlreadyExistent = m_xExternalViewController.is();
+ bool bAlreadyExistent = m_xExternalViewController.is();
Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame;
OUString sFrameName("_beamer");
sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
@@ -3558,7 +3558,7 @@ void FmXFormShell::CreateExternalView()
OSL_FAIL("FmXFormShell::CreateExternalView : could not create the external form view !");
}
#endif
- InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False );
+ InvalidateSlot( SID_FM_VIEW_AS_GRID, false );
}
@@ -3584,7 +3584,7 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPr
if (pSearch->equalsAscii("FormControlPilotsEnabled"))
{
implAdjustConfigCache();
- InvalidateSlot( SID_FM_USE_WIZARDS, sal_True );
+ InvalidateSlot( SID_FM_USE_WIZARDS, true );
}
}
@@ -3593,7 +3593,7 @@ void FmXFormShell::Commit()
}
-void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
+void FmXFormShell::SetWizardUsing(bool _bUseThem)
{
m_bUseWizards = _bUseThem;
@@ -3605,7 +3605,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
}
-void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
+void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController /* = sal_True */ )
{
if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() )
@@ -3642,7 +3642,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti
{
pPage->GetImpl().SetFormsCreationHdl( Link() );
}
- UpdateForms( sal_True );
+ UpdateForms( true );
}
@@ -3670,12 +3670,12 @@ IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ )
IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
{
- UpdateForms( sal_True );
+ UpdateForms( true );
return 0L;
}
-void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
+void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction /* = sal_False */ )
{
FmFormPage* pPage = _rCurrentView.GetCurPage();
@@ -3709,7 +3709,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
pPage->GetImpl().SetFormsCreationHdl( LINK( this, FmXFormShell, OnFormsCreated ) );
}
- UpdateForms( sal_True );
+ UpdateForms( true );
if ( !hasEverBeenActivated() )
{
@@ -3969,7 +3969,7 @@ void FmXFormShell::SetControlActivationHandler( const Link& _rHdl )
void FmXFormShell::handleShowPropertiesRequest()
{
if ( onlyControlsAreMarked() )
- ShowSelectionProperties( sal_True );
+ ShowSelectionProperties( true );
}
@@ -3981,7 +3981,7 @@ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
if ( _rViewEvent.eHit == SDRHIT_MARKEDOBJECT )
{
if ( onlyControlsAreMarked() )
- ShowSelectionProperties( sal_True );
+ ShowSelectionProperties( true );
}
}
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 2d524fdebc0b..baf98b6c97bf 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -472,8 +472,8 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
WildCard aSearchExpression(strExpression);
- sal_Bool bFound(sal_False);
- sal_Bool bMovedAround(sal_False);
+ bool bFound(false);
+ bool bMovedAround(false);
do
{
if (m_eMode == SM_ALLOWSCHEDULE)
@@ -575,7 +575,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
bool bFound = false;
- sal_Bool bMovedAround(sal_False);
+ bool bMovedAround(false);
do
{
if (m_eMode == SM_ALLOWSCHEDULE)
@@ -848,7 +848,7 @@ void FmSearchEngine::Init(const OUString& sVisibleFields)
xMeta = xConn->getMetaData();
OSL_ENSURE( xMeta.is(), "FmSearchEngine::Init: very strange cursor (could not derive connection meta data from it)!" );
- sal_Bool bCaseSensitiveIdentifiers = sal_True; // assume case sensivity
+ bool bCaseSensitiveIdentifiers = true; // assume case sensivity
if ( xMeta.is() )
bCaseSensitiveIdentifiers = xMeta->supportsMixedCaseQuotedIdentifiers();
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 33b4f185d9f9..bc46692250ec 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -383,7 +383,7 @@ namespace svx
{
case TypeClass_BOOLEAN:
{
- sal_Bool bState = sal_False;
+ bool bState = false;
_rUnoState >>= bState;
if ( _nSlot == SID_ATTR_PARA_SCRIPTSPACE )
_rSet.Put( SvxScriptSpaceItem( bState, nWhich ) );
@@ -480,7 +480,7 @@ namespace svx
bIsReadOnlyModel = true;
else
{
- sal_Bool bReadOnly = sal_True;
+ bool bReadOnly = true;
xModelProps->getPropertyValue( FM_PROP_READONLY ) >>= bReadOnly;
bIsReadOnlyModel = bReadOnly;
}
@@ -724,7 +724,7 @@ namespace svx
{
aArgs.realloc( 1 );
aArgs[ 0 ].Name = "Enable";
- aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue();
+ aArgs[ 0 ].Value <<= pBoolItem->GetValue();
}
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index d97edf064da0..000446048c3a 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -146,8 +146,8 @@ private:
struct PropertyInfo
{
- sal_Bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
- sal_Bool bIsValueProperty : 1; // the property is the special value property, thus it may be handled
+ bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
+ bool bIsValueProperty : 1; // the property is the special value property, thus it may be handled
// as if it's transient or persistent
};
@@ -156,7 +156,7 @@ struct PropertySetInfo
typedef std::map<OUString, PropertyInfo> AllProperties;
AllProperties aProps; // all properties of this set which we know so far
- sal_Bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
+ bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
// sal_False -> the set has _no_ such property or its value isn't empty
};
@@ -353,10 +353,10 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
namespace
{
- sal_Bool lcl_searchElement(const Reference< XIndexAccess>& xCont, const Reference< XInterface >& xElement)
+ bool lcl_searchElement(const Reference< XIndexAccess>& xCont, const Reference< XInterface >& xElement)
{
if (!xCont.is() || !xElement.is())
- return sal_False;
+ return false;
sal_Int32 nCount = xCont->getCount();
Reference< XInterface > xComp;
@@ -368,12 +368,12 @@ namespace
if (xComp.is())
{
if ( xElement == xComp )
- return sal_True;
+ return true;
else
{
Reference< XIndexAccess> xCont2(xComp, UNO_QUERY);
if (xCont2.is() && lcl_searchElement(xCont2, xElement))
- return sal_True;
+ return true;
}
}
}
@@ -382,7 +382,7 @@ namespace
DBG_UNHANDLED_EXCEPTION();
}
}
- return sal_False;
+ return false;
}
}
@@ -587,7 +587,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
PropertySetInfo aNewEntry;
if (!::comphelper::hasProperty(FM_PROP_CONTROLSOURCE, xSet))
{
- aNewEntry.bHasEmptyControlSource = sal_False;
+ aNewEntry.bHasEmptyControlSource = false;
}
else
{
@@ -625,7 +625,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0);
// check if it is the special "DataFieldProperty"
- aNewEntry.bIsValueProperty = sal_False;
+ aNewEntry.bIsValueProperty = false;
try
{
if (::comphelper::hasProperty(FM_PROP_CONTROLSOURCEPROPERTY, xSet))
@@ -682,7 +682,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
static const OUString s_sExternalData( "ExternalData" );
if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) )
{
- sal_Bool bExternalData = sal_True;
+ bool bExternalData = true;
OSL_VERIFY( xBindingProps->getPropertyValue( s_sExternalData ) >>= bExternalData );
bAddUndoAction = !bExternalData;
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 625c9ef79aad..e6234e2c942c 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -106,7 +106,7 @@ void FmFormView::Init()
// DesignMode vom Model holen
- sal_Bool bInitDesignMode = pFormModel->GetOpenInDesignMode();
+ bool bInitDesignMode = pFormModel->GetOpenInDesignMode();
if ( pFormModel->OpenInDesignModeIsDefaulted( ) )
{ // this means that nobody ever explicitly set this on the model, and the model has never
// been loaded from a stream.
@@ -116,7 +116,7 @@ void FmFormView::Init()
DBG_ASSERT( !bInitDesignMode, "FmFormView::Init: doesn't the model default to FALSE anymore?" );
// if this asserts, either the on-contruction default in the model has changed (then this here
// may not be necessary anymore), or we're not dealing with a new document ....
- bInitDesignMode = sal_True;
+ bInitDesignMode = true;
}
SfxObjectShell* pObjShell = pFormModel->GetObjectShell();
@@ -131,7 +131,7 @@ void FmFormView::Init()
}
if( pObjShell && pObjShell->IsReadOnly() )
- bInitDesignMode = sal_False;
+ bInitDesignMode = false;
// dieses wird in der Shell vorgenommen
// bDesignMode = !bInitDesignMode; // erzwingt, dass SetDesignMode ausgefuehrt wird
@@ -247,9 +247,9 @@ void FmFormView::ChangeDesignMode(bool bDesign)
// --- 2. simulate a deactivation (the shell will handle some things there ...?)
if ( pFormShell && pFormShell->GetImpl() )
- pFormShell->GetImpl()->viewDeactivated( *this, sal_True );
+ pFormShell->GetImpl()->viewDeactivated( *this, true );
else
- pImpl->Deactivate( sal_True );
+ pImpl->Deactivate( true );
// --- 3. activate all controls, if we're switching to alive mode
if ( !bDesign )
@@ -302,7 +302,7 @@ void FmFormView::ChangeDesignMode(bool bDesign)
else
{
// set the auto focus to the first control (if indicated by the model to do so)
- sal_Bool bForceControlFocus = pModel ? pModel->GetAutoControlFocus() : sal_False;
+ bool bForceControlFocus = pModel ? pModel->GetAutoControlFocus() : sal_False;
if (bForceControlFocus)
pImpl->AutoFocus();
}
@@ -338,7 +338,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
else if ( pFormShell && pFormShell->IsDesignMode() )
{
FmXFormShell* pFormShellImpl = pFormShell->GetImpl();
- pFormShellImpl->UpdateForms( sal_True );
+ pFormShellImpl->UpdateForms( true );
// damit der Formular-Navigator auf den Seitenwechsel reagieren kann
pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL, true, false);
@@ -365,9 +365,9 @@ void FmFormView::HideSdrPage()
// --- 2. tell the shell the view is (going to be) deactivated
if ( pFormShell && pFormShell->GetImpl() )
- pFormShell->GetImpl()->viewDeactivated( *this, sal_True );
+ pFormShell->GetImpl()->viewDeactivated( *this, true );
else
- pImpl->Deactivate( sal_True );
+ pImpl->Deactivate( true );
// --- 3. base class behavior
E3dView::HideSdrPage();
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8dc9774d3e94..58440cbd4e8a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -733,7 +733,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
}
-void FmXFormView::Activate(sal_Bool bSync)
+void FmXFormView::Activate(bool bSync)
{
if (m_nActivationEvent)
{
@@ -750,7 +750,7 @@ void FmXFormView::Activate(sal_Bool bSync)
}
-void FmXFormView::Deactivate(sal_Bool bDeactivateController)
+void FmXFormView::Deactivate(bool bDeactivateController)
{
if (m_nActivationEvent)
{
@@ -769,7 +769,7 @@ FmFormShell* FmXFormView::GetFormShell() const
return m_pView ? m_pView->GetFormShell() : NULL;
}
-void FmXFormView::AutoFocus( sal_Bool _bSync )
+void FmXFormView::AutoFocus( bool _bSync )
{
if (m_nAutoFocusEvent)
Application::RemoveUserEvent(m_nAutoFocusEvent);
@@ -791,7 +791,7 @@ bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
Reference< XPropertySet > xModelProps( i_rControl->getModel(), UNO_QUERY_THROW );
// only enabled controls are allowed to participate
- sal_Bool bEnabled = sal_False;
+ bool bEnabled = false;
OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_ENABLED ) >>= bEnabled );
if ( !bEnabled )
return false;
@@ -994,7 +994,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
return;
// it is valid that the form shell's forms collection is not initialized, yet
- pShellImpl->UpdateForms( sal_True );
+ pShellImpl->UpdateForms( true );
m_xLastCreatedControlModel.set( _rFormObject.GetUnoControlModel(), UNO_QUERY );
if ( !m_xLastCreatedControlModel.is() )
@@ -1207,7 +1207,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
if ( !xField.is() )
return NULL;
- Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, sal_False ), UNO_SET_THROW );
+ Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, false ), UNO_SET_THROW );
Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW );
OUString sLabelPostfix;
@@ -1248,9 +1248,9 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
// determine the control type by examining the data type of the bound column
sal_uInt16 nOBJID = 0;
- sal_Bool bDateNTimeField = sal_False;
+ bool bDateNTimeField = false;
- sal_Bool bIsCurrency = sal_False;
+ bool bIsCurrency = false;
if (::comphelper::hasProperty(FM_PROP_ISCURRENCY, xField))
bIsCurrency = ::comphelper::getBOOL(xField->getPropertyValue(FM_PROP_ISCURRENCY));
@@ -1286,7 +1286,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
nOBJID = OBJ_FM_FORMATTEDFIELD;
break;
case DataType::TIMESTAMP:
- bDateNTimeField = sal_True;
+ bDateNTimeField = true;
sLabelPostfix = SVX_RESSTR(RID_STR_POSTFIX_DATE);
// DON'T break !
case DataType::DATE:
@@ -1639,7 +1639,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
if ( (nDataType == DataType::LONGVARCHAR || nDataType == DataType::CLOB) && xControlPropInfo->hasPropertyByName( FM_PROP_MULTILINE ) )
{
- xControlSet->setPropertyValue( FM_PROP_MULTILINE, makeAny( sal_Bool( sal_True ) ) );
+ xControlSet->setPropertyValue( FM_PROP_MULTILINE, makeAny( true ) );
}
// announce the label to the control
@@ -1732,7 +1732,7 @@ void FmXFormView::startMarkListWatching()
}
-void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
+void FmXFormView::saveMarkList( bool _bSmartUnmark )
{
if ( m_pView )
{
@@ -1750,7 +1750,7 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
if ( pObj->IsGroupObject() )
{
SdrObjListIter aIter( *pObj->GetSubList() );
- sal_Bool bMixed = sal_False;
+ bool bMixed = false;
while ( aIter.IsMore() && !bMixed )
bMixed = ( aIter.Next()->GetObjInventor() != FmFormInventor );
@@ -1779,9 +1779,9 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
}
-static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
+static bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
{
- sal_Bool bFound = sal_False;
+ bool bFound = false;
while (rIter.IsMore() && !bFound)
bFound = pObj == rIter.Next();
@@ -1803,7 +1803,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
{
if (rCurrentList.GetMarkCount())
{ // there is a current mark ... hmm. Is it a subset of the mark we remembered in saveMarkList?
- sal_Bool bMisMatch = sal_False;
+ bool bMisMatch = false;
// loop through all current marks
sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount();
@@ -1812,17 +1812,17 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj();
// loop through all saved marks, check for equality
- sal_Bool bFound = sal_False;
+ bool bFound = false;
sal_uIntPtr nSavedCount = m_aMark.GetMarkCount();
for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j )
{
if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked )
- bFound = sal_True;
+ bFound = true;
}
// did not find a current mark in the saved marks
if ( !bFound )
- bMisMatch = sal_True;
+ bMisMatch = true;
}
if ( bMisMatch )
@@ -1836,7 +1836,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
// da diese bereits zerstoert sein koennen
SdrPageView* pCurPageView = m_pView->GetSdrPageView();
SdrObjListIter aPageIter( *pPage );
- sal_Bool bFound = sal_True;
+ bool bFound = true;
// gibt es noch alle Objecte
sal_uIntPtr nCount = m_aMark.GetMarkCount();
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 9e9859f6dfbc..c4fb5435a210 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -410,7 +410,7 @@ namespace svxform
switch ( nClassId )
{
case FormComponentType::SCROLLBAR:
- _rxControlModel->setPropertyValue("LiveScroll", makeAny( (sal_Bool)sal_True ) );
+ _rxControlModel->setPropertyValue("LiveScroll", makeAny( true ) );
// NO break!
case FormComponentType::SPINBUTTON:
{
@@ -424,9 +424,9 @@ namespace svxform
case FormComponentType::LISTBOX:
case FormComponentType::COMBOBOX:
{
- sal_Bool bDropDown = !_rControlBoundRect.IsEmpty() && ( _rControlBoundRect.GetWidth() >= 3 * _rControlBoundRect.GetHeight() );
+ bool bDropDown = !_rControlBoundRect.IsEmpty() && ( _rControlBoundRect.GetWidth() >= 3 * _rControlBoundRect.GetHeight() );
if ( xPSI->hasPropertyByName( FM_PROP_DROPDOWN ) )
- _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN, makeAny( (sal_Bool)bDropDown ) );
+ _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN, makeAny( bDropDown ) );
_rxControlModel->setPropertyValue( FM_PROP_LINECOUNT, makeAny( sal_Int16( 20 ) ) );
}
break;
@@ -441,7 +441,7 @@ namespace svxform
)
{
if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) )
- _rxControlModel->setPropertyValue( FM_PROP_MULTILINE, makeAny( (sal_Bool)sal_True ) );
+ _rxControlModel->setPropertyValue( FM_PROP_MULTILINE, makeAny( true ) );
}
}
break;
@@ -499,7 +499,7 @@ namespace svxform
// strict format = yes is the default (i93467)
if ( xPSI->hasPropertyByName( FM_PROP_STRICTFORMAT ) )
{
- _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT, makeAny( sal_Bool( sal_True ) ) );
+ _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT, makeAny( true ) );
}
// mouse wheel: don't use it for scrolling by default (i110036)
@@ -533,7 +533,7 @@ namespace svxform
// let's see if the data source which the form belongs to (if any)
// has a setting for the preferred line end format
- sal_Bool bDosLineEnds = sal_False;
+ bool bDosLineEnds = false;
Sequence< PropertyValue > aInfo = lcl_getDataSourceIndirectProperties( _rxModel, m_pData->m_xContext );
const PropertyValue* pInfo = aInfo.getConstArray();
const PropertyValue* pInfoEnd = pInfo + aInfo.getLength();
@@ -644,7 +644,7 @@ namespace svxform
{
sal_Int32 nNullable = ColumnValue::NULLABLE_UNKNOWN;
OSL_VERIFY( _rxDatabaseField->getPropertyValue( FM_PROP_ISNULLABLE ) >>= nNullable );
- _rxControlModel->setPropertyValue( FM_PROP_TRISTATE, makeAny( sal_Bool( ColumnValue::NO_NULLS != nNullable ) ) );
+ _rxControlModel->setPropertyValue( FM_PROP_TRISTATE, makeAny( ColumnValue::NO_NULLS != nNullable ) );
}
}
catch( const Exception& )
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0db6820b2826..769302eb2eb4 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -217,8 +217,8 @@ struct ColumnInfo
// information about the column itself
Reference< XColumn > xColumn;
sal_Int32 nNullable;
- sal_Bool bAutoIncrement;
- sal_Bool bReadOnly;
+ bool bAutoIncrement;
+ bool bReadOnly;
OUString sName;
// information about the control(s) bound to this column
@@ -237,8 +237,8 @@ struct ColumnInfo
ColumnInfo()
:xColumn()
,nNullable( ColumnValue::NULLABLE_UNKNOWN )
- ,bAutoIncrement( sal_False )
- ,bReadOnly( sal_False )
+ ,bAutoIncrement( false )
+ ,bReadOnly( false )
,sName()
,xFirstControlWithInputRequired()
,xFirstGridWithInputRequiredColumn()
@@ -313,9 +313,9 @@ namespace
bool lcl_isInputRequired( const Reference< XPropertySet >& _rxControlModel )
{
- sal_Bool bInputRequired = sal_True;
+ bool bInputRequired = true;
OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_INPUT_REQUIRED ) >>= bInputRequired );
- return ( bInputRequired != sal_False );
+ return ( bInputRequired != false );
}
void lcl_resetColumnControlInfo( ColumnInfo& _rColInfo )
@@ -565,19 +565,19 @@ FormController::FormController(const Reference< css::uno::XComponentContext > &
,m_aActivationEvent( LINK( this, FormController, OnActivated ) )
,m_aDeactivationEvent( LINK( this, FormController, OnDeactivated ) )
,m_nCurrentFilterPosition(-1)
- ,m_bCurrentRecordModified(sal_False)
- ,m_bCurrentRecordNew(sal_False)
- ,m_bLocked(sal_False)
- ,m_bDBConnection(sal_False)
- ,m_bCycle(sal_False)
- ,m_bCanInsert(sal_False)
- ,m_bCanUpdate(sal_False)
- ,m_bCommitLock(sal_False)
- ,m_bModified(sal_False)
- ,m_bControlsSorted(sal_False)
- ,m_bFiltering(sal_False)
- ,m_bAttachEvents(sal_True)
- ,m_bDetachEvents(sal_True)
+ ,m_bCurrentRecordModified(false)
+ ,m_bCurrentRecordNew(false)
+ ,m_bLocked(false)
+ ,m_bDBConnection(false)
+ ,m_bCycle(false)
+ ,m_bCanInsert(false)
+ ,m_bCanUpdate(false)
+ ,m_bCommitLock(false)
+ ,m_bModified(false)
+ ,m_bControlsSorted(false)
+ ,m_bFiltering(false)
+ ,m_bAttachEvents(true)
+ ,m_bDetachEvents(true)
,m_bAttemptedHandlerCreation( false )
,m_bSuspendFilterTextListening( false )
{
@@ -703,7 +703,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime
{
::osl::MutexGuard aGuard(m_aMutex);
if (getCurrentControl().is() && (getCurrentControl()->getModel() == rEvent.Source))
- m_bModified = sal_False;
+ m_bModified = false;
}
@@ -807,7 +807,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
if (xConnection.is())
{
Reference< XDatabaseMetaData> xMetaData(xConnection->getMetaData());
- Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats( xConnection, sal_True ) );
+ Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats( xConnection, true ) );
Reference< XNumberFormatter> xFormatter = NumberFormatter::create(m_xComponentContext);
xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
@@ -1234,7 +1234,7 @@ void FormController::disposing(void)
::comphelper::disposeComponent( m_xComposer );
- m_bDBConnection = sal_False;
+ m_bDBConnection = false;
}
@@ -1263,7 +1263,7 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) thr
if ( !xOldBound.is() && evt.NewValue.hasValue() )
{
Reference< XControlModel > xControlModel(evt.Source,UNO_QUERY);
- Reference< XControl > xControl = findControl(m_aControls,xControlModel,sal_False,sal_False);
+ Reference< XControl > xControl = findControl(m_aControls,xControlModel,false,false);
if ( xControl.is() )
{
startControlModifyListening( xControl );
@@ -1275,8 +1275,8 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) thr
}
else
{
- sal_Bool bModifiedChanged = (evt.PropertyName == FM_PROP_ISMODIFIED);
- sal_Bool bNewChanged = (evt.PropertyName == FM_PROP_ISNEW);
+ bool bModifiedChanged = (evt.PropertyName == FM_PROP_ISMODIFIED);
+ bool bNewChanged = (evt.PropertyName == FM_PROP_ISNEW);
if (bModifiedChanged || bNewChanged)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1300,7 +1300,7 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) thr
m_aToggleEvent.Call();
if (!m_bCurrentRecordModified)
- m_bModified = sal_False;
+ m_bModified = false;
}
else if ( evt.PropertyName == FM_PROP_DYNAMIC_CONTROL_BORDER )
{
@@ -1381,7 +1381,7 @@ bool FormController::replaceControl( const Reference< XControl >& _rxExistentCon
}
-void FormController::toggleAutoFields(sal_Bool bAutoFields)
+void FormController::toggleAutoFields(bool bAutoFields)
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1394,7 +1394,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
{
// as we don't want new controls to be attached to the scripting environment
// we change attach flags
- m_bAttachEvents = sal_False;
+ m_bAttachEvents = false;
for (sal_Int32 i = nControls; i > 0;)
{
Reference< XControl > xControl = pControls[--i];
@@ -1418,11 +1418,11 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
}
}
}
- m_bAttachEvents = sal_True;
+ m_bAttachEvents = true;
}
else
{
- m_bDetachEvents = sal_False;
+ m_bDetachEvents = false;
for (sal_Int32 i = nControls; i > 0;)
{
Reference< XControl > xControl = pControls[--i];
@@ -1449,7 +1449,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
}
}
}
- m_bDetachEvents = sal_True;
+ m_bDetachEvents = true;
}
}
@@ -1587,7 +1587,7 @@ void FormController::impl_onModify()
{
::osl::MutexGuard aGuard( m_aMutex );
if ( !m_bModified )
- m_bModified = sal_True;
+ m_bModified = true;
}
EventObject aEvt(static_cast<cppu::OWeakObject*>(this));
@@ -1622,7 +1622,7 @@ void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rCl
}
-sal_Bool FormController::determineLockState() const
+bool FormController::determineLockState() const
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
// a.) in filter mode we are always locked
@@ -1631,7 +1631,7 @@ sal_Bool FormController::determineLockState() const
// d.) if are not updatable or on invalid position
Reference< XResultSet > xResultSet(m_xModelAsIndex, UNO_QUERY);
if (m_bFiltering || !xResultSet.is() || !isRowSetAlive(xResultSet))
- return sal_True;
+ return true;
else
return (m_bCanInsert && m_bCurrentRecordNew) ? sal_False
: xResultSet->isBeforeFirst() || xResultSet->isAfterLast() || xResultSet->rowDeleted() || !m_bCanUpdate;
@@ -1687,7 +1687,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s
xBound = Reference< XBoundComponent > (m_xCurrentControl->getModel(), UNO_QUERY);
// lock if we lose the focus during commit
- m_bCommitLock = sal_True;
+ m_bCommitLock = true;
// Commit nicht erfolgreich, Focus zuruecksetzen
if (xBound.is() && !xBound->commit())
@@ -1701,8 +1701,8 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s
}
else
{
- m_bModified = sal_False;
- m_bCommitLock = sal_False;
+ m_bModified = false;
+ m_bCommitLock = false;
}
}
@@ -1741,7 +1741,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s
return;
}
- sal_Bool bActivated = !m_xActiveControl.is() && xControl.is();
+ bool bActivated = !m_xActiveControl.is() && xControl.is();
m_xActiveControl = xControl;
@@ -1839,7 +1839,7 @@ void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) thro
void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException, std::exception)
{
- Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), sal_False, sal_False ) );
+ Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), false, false ) );
Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY );
OSL_ENSURE( xControl.is() && xValidatable.is(), "FormController::componentValidityChanged: huh?" );
@@ -2082,7 +2082,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai
sal_Int32 i, j;
for (i = 0, j = 0; i < nCount; ++i, ++pModels )
{
- Reference< XControl > xControl = findControl( aAllControls, *pModels, sal_False, sal_True );
+ Reference< XControl > xControl = findControl( aAllControls, *pModels, false, true );
if ( xControl.is() )
{
pControls[j++] = xControl;
@@ -2109,7 +2109,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai
}
}
// befinden sich die Controls in der richtigen Reihenfolge
- m_bControlsSorted = sal_True;
+ m_bControlsSorted = true;
}
@@ -2149,7 +2149,7 @@ Sequence< Reference< XControl > > FormController::getControls(void) throw( Runti
sal_Int32 j = 0;
for (sal_Int32 i = 0; i < nModels; ++i, ++pModels )
{
- xControl = findControl( m_aControls, *pModels, sal_True, sal_True );
+ xControl = findControl( m_aControls, *pModels, true, true );
if ( xControl.is() )
pControls[j++] = xControl;
}
@@ -2159,7 +2159,7 @@ Sequence< Reference< XControl > > FormController::getControls(void) throw( Runti
aNewControls.realloc( j );
m_aControls = aNewControls;
- m_bControlsSorted = sal_True;
+ m_bControlsSorted = true;
}
return m_aControls;
}
@@ -2190,13 +2190,13 @@ void FormController::activateTabOrder() throw( RuntimeException, std::exception
void FormController::setControlLock(const Reference< XControl > & xControl)
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
- sal_Bool bLocked = isLocked();
+ bool bLocked = isLocked();
// es wird gelockt
// a.) wenn der ganze Datensatz gesperrt ist
// b.) wenn das zugehoerige Feld gespeert ist
Reference< XBoundControl > xBound(xControl, UNO_QUERY);
- if (xBound.is() && (( (bLocked && bLocked != xBound->getLock()) ||
+ if (xBound.is() && (( (bLocked && (bLocked ? 1 : 0) != xBound->getLock()) ||
!bLocked))) // beim entlocken immer einzelne Felder ueberpr�fen
{
// gibt es eine Datenquelle
@@ -2204,7 +2204,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl)
if (xSet.is() && ::comphelper::hasProperty(FM_PROP_BOUNDFIELD, xSet))
{
// wie sieht mit den Properties ReadOnly und Enable aus
- sal_Bool bTouch = sal_True;
+ bool bTouch = true;
if (::comphelper::hasProperty(FM_PROP_ENABLED, xSet))
bTouch = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ENABLED));
if (::comphelper::hasProperty(FM_PROP_READONLY, xSet))
@@ -2382,7 +2382,7 @@ void FormController::stopControlModifyListening(const Reference< XControl > & xC
void FormController::startListening()
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
- m_bModified = sal_False;
+ m_bModified = false;
// jetzt anmelden bei gebundenen feldern
const Reference< XControl >* pControls = m_aControls.getConstArray();
@@ -2395,7 +2395,7 @@ void FormController::startListening()
void FormController::stopListening()
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
- m_bModified = sal_False;
+ m_bModified = false;
// jetzt anmelden bei gebundenen feldern
const Reference< XControl >* pControls = m_aControls.getConstArray();
@@ -2406,7 +2406,7 @@ void FormController::stopListening()
-Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const
+Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,bool _bRemove,bool _bOverWrite) const
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
DBG_ASSERT( xCtrlModel.is(), "findControl - welches ?!" );
@@ -2523,7 +2523,7 @@ void FormController::implSetCurrentControl( const Reference< XControl >& _rxCont
void FormController::insertControl(const Reference< XControl > & xControl)
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
- m_bControlsSorted = sal_False;
+ m_bControlsSorted = false;
m_aControls.realloc(m_aControls.getLength() + 1);
m_aControls.getArray()[m_aControls.getLength() - 1] = xControl;
@@ -2589,7 +2589,7 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException,
m_bCurrentRecordModified = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISMODIFIED));
m_bCurrentRecordNew = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ISNEW));
- startFormListening( xSet, sal_False );
+ startFormListening( xSet, false );
// set the locks for the current controls
if (getContainer().is())
@@ -2599,20 +2599,20 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException,
}
else
{
- m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
- m_bCurrentRecordModified = sal_False;
- m_bCurrentRecordNew = sal_False;
- m_bLocked = sal_False;
+ m_bCanInsert = m_bCanUpdate = m_bCycle = false;
+ m_bCurrentRecordModified = false;
+ m_bCurrentRecordNew = false;
+ m_bLocked = false;
}
- m_bDBConnection = sal_True;
+ m_bDBConnection = true;
}
else
{
- m_bDBConnection = sal_False;
- m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
- m_bCurrentRecordModified = sal_False;
- m_bCurrentRecordNew = sal_False;
- m_bLocked = sal_False;
+ m_bDBConnection = false;
+ m_bCanInsert = m_bCanUpdate = m_bCycle = false;
+ m_bCurrentRecordModified = false;
+ m_bCurrentRecordNew = false;
+ m_bLocked = false;
}
Reference< XColumnsSupplier > xFormColumns( xForm, UNO_QUERY );
@@ -2647,7 +2647,7 @@ IMPL_LINK_NOARG(FormController, OnLoad)
// just one exception toggle the auto values
if (m_bCurrentRecordNew)
- toggleAutoFields(sal_True);
+ toggleAutoFields(true);
return 1L;
}
@@ -2701,7 +2701,7 @@ void FormController::unload() throw( RuntimeException )
// be sure not to have autofields
if (m_bCurrentRecordNew)
- toggleAutoFields(sal_False);
+ toggleAutoFields(false);
// remove bound field listing again
removeBoundFieldListener();
@@ -2711,11 +2711,11 @@ void FormController::unload() throw( RuntimeException )
Reference< XPropertySet > xSet( m_xModelAsIndex, UNO_QUERY );
if ( m_bDBConnection && xSet.is() )
- stopFormListening( xSet, sal_False );
+ stopFormListening( xSet, false );
- m_bDBConnection = sal_False;
- m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
- m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = sal_False;
+ m_bDBConnection = false;
+ m_bCanInsert = m_bCanUpdate = m_bCycle = false;
+ m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = false;
m_pColumnInfoCache.reset();
}
@@ -2734,7 +2734,7 @@ void FormController::removeBoundFieldListener()
}
-void FormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
+void FormController::startFormListening( const Reference< XPropertySet >& _rxForm, bool _bPropertiesOnly )
{
try
{
@@ -2768,7 +2768,7 @@ void FormController::startFormListening( const Reference< XPropertySet >& _rxFor
}
-void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
+void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm, bool _bPropertiesOnly )
{
try
{
@@ -2818,7 +2818,7 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc
}
// neither the current control nor the current record are modified anymore
- m_bCurrentRecordModified = m_bModified = sal_False;
+ m_bCurrentRecordModified = m_bModified = false;
}
@@ -3121,7 +3121,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
// need to parse criteria localized
OStaticDataAccessTools aStaticTools;
- Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, sal_True));
+ Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, true));
Reference< XNumberFormatter> xFormatter = NumberFormatter::create(m_xComponentContext);
xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale();
@@ -3260,11 +3260,11 @@ void FormController::startFiltering()
if (isListeningForChanges())
stopListening();
- m_bFiltering = sal_True;
+ m_bFiltering = true;
// as we don't want new controls to be attached to the scripting environment
// we change attach flags
- m_bAttachEvents = sal_False;
+ m_bAttachEvents = false;
// Austauschen der Kontrols fuer das aktuelle Formular
Sequence< Reference< XControl > > aControlsCopy( m_aControls );
@@ -3273,7 +3273,7 @@ void FormController::startFiltering()
// the control we have to activate after replacement
Reference< XDatabaseMetaData > xMetaData(xConnection->getMetaData());
- Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats(xConnection, sal_True);
+ Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats(xConnection, true);
Reference< XNumberFormatter > xFormatter = NumberFormatter::create(m_xComponentContext);
xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
@@ -3374,14 +3374,14 @@ void FormController::startFiltering()
Reference< XPropertySet > xSet( m_xModelAsIndex, UNO_QUERY );
if ( xSet.is() )
- stopFormListening( xSet, sal_True );
+ stopFormListening( xSet, true );
impl_setTextOnAllFilter_throw();
// lock all controls which are not used for filtering
m_bLocked = determineLockState();
setLocks();
- m_bAttachEvents = sal_True;
+ m_bAttachEvents = true;
}
@@ -3393,8 +3393,8 @@ void FormController::stopFiltering()
return;
}
- m_bFiltering = sal_False;
- m_bDetachEvents = sal_False;
+ m_bFiltering = false;
+ m_bDetachEvents = false;
::comphelper::disposeComponent(m_xComposer);
@@ -3451,9 +3451,9 @@ void FormController::stopFiltering()
Reference< XPropertySet > xSet( m_xModelAsIndex, UNO_QUERY );
if ( xSet.is() )
- startFormListening( xSet, sal_True );
+ startFormListening( xSet, true );
- m_bDetachEvents = sal_True;
+ m_bDetachEvents = true;
m_aFilterRows.clear();
m_nCurrentFilterPosition = -1;
@@ -3643,7 +3643,7 @@ namespace
}
}
- sal_Bool lcl_shouldValidateRequiredFields_nothrow( const Reference< XInterface >& _rxForm )
+ bool lcl_shouldValidateRequiredFields_nothrow( const Reference< XInterface >& _rxForm )
{
try
{
@@ -3656,7 +3656,7 @@ namespace
Reference< XPropertySetInfo > xPSI( xFormProps->getPropertySetInfo() );
if ( xPSI->hasPropertyByName( s_sFormsCheckRequiredFields ) )
{
- sal_Bool bShouldValidate = true;
+ bool bShouldValidate = true;
OSL_VERIFY( xFormProps->getPropertyValue( s_sFormsCheckRequiredFields ) >>= bShouldValidate );
return bShouldValidate;
}
@@ -3666,13 +3666,13 @@ namespace
Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY );
if ( !xDataSource.is() )
// seldom (but possible): this is not a connection created by a data source
- return sal_True;
+ return true;
Reference< XPropertySet > xDataSourceSettings(
xDataSource->getPropertyValue("Settings"),
UNO_QUERY_THROW );
- sal_Bool bShouldValidate = true;
+ bool bShouldValidate = true;
OSL_VERIFY( xDataSourceSettings->getPropertyValue( s_sFormsCheckRequiredFields ) >>= bShouldValidate );
return bShouldValidate;
}
@@ -3681,7 +3681,7 @@ namespace
DBG_UNHANDLED_EXCEPTION();
}
- return sal_True;
+ return true;
}
}
@@ -3693,7 +3693,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
impl_checkDisposed_throw();
::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
- sal_Bool bValid = sal_True;
+ bool bValid = true;
if (aIter.hasMoreElements())
{
RowChangeEvent aEvt( _rEvent );
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 826df4b5bdb9..541fa5d99f3d 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -284,10 +284,10 @@ namespace svx
}
- sal_Bool FormControllerHelper::isEnabled( sal_Int32 _nSlotId ) const
+ bool FormControllerHelper::isEnabled( sal_Int32 _nSlotId ) const
{
if ( !m_xFormOperations.is() )
- return sal_False;
+ return false;
return m_xFormOperations->isEnabled( FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ) );
}
@@ -308,13 +308,13 @@ namespace svx
}
- sal_Bool FormControllerHelper::commitCurrentControl( ) const
+ bool FormControllerHelper::commitCurrentControl( ) const
{
return impl_operateForm_nothrow( COMMIT_CONTROL );
}
- sal_Bool FormControllerHelper::commitCurrentRecord() const
+ bool FormControllerHelper::commitCurrentRecord() const
{
return impl_operateForm_nothrow( COMMIT_RECORD );
}
@@ -472,18 +472,18 @@ namespace svx
}
- sal_Bool FormControllerHelper::isInsertionRow() const
+ bool FormControllerHelper::isInsertionRow() const
{
- sal_Bool bIs = sal_False;
+ bool bIs = false;
if ( m_xFormOperations.is() )
bIs = m_xFormOperations->isInsertionRow();
return bIs;
}
- sal_Bool FormControllerHelper::isModifiedRow() const
+ bool FormControllerHelper::isModifiedRow() const
{
- sal_Bool bIs = sal_False;
+ bool bIs = false;
if ( m_xFormOperations.is() )
bIs = m_xFormOperations->isModifiedRow();
return bIs;
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 28d4cd7f6d66..8544acc22dd5 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -57,7 +57,7 @@ namespace svxform
,m_aFallback()
,m_pMutex( _pMaster && _pMaster->getInterceptorMutex() ? _pMaster->getInterceptorMutex() : &m_aFallback )
,m_xIntercepted(_rxToIntercept)
- ,m_bListening(sal_False)
+ ,m_bListening(false)
,m_pMaster(_pMaster)
{
@@ -72,7 +72,7 @@ namespace svxform
if (xInterceptedComponent.is())
{
xInterceptedComponent->addEventListener(this);
- m_bListening = sal_True;
+ m_bListening = true;
}
}
::comphelper::decrement(m_refCount);
@@ -173,7 +173,7 @@ namespace svxform
// 88936 - 23.07.2001 - frank.schoenheit@sun.com
m_pMaster = NULL;
m_pMutex = &m_aFallback;
- m_bListening = sal_False;
+ m_bListening = false;
}
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 65a11582036e..8f108f394e38 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -46,8 +46,8 @@ namespace svx
,m_xFormOperations( _rxFormOperations )
,m_aFeatureURL( _rFeatureURL )
,m_nFormFeature( _nFormFeature )
- ,m_bLastKnownEnabled( sal_False )
- ,m_bDisposed( sal_False )
+ ,m_bLastKnownEnabled( false )
+ ,m_bDisposed( false )
{
}
@@ -72,7 +72,7 @@ namespace svx
FeatureStateEvent aUnoState;
getUnoState( aUnoState );
- if ( ( m_aLastKnownState == aUnoState.State ) && ( m_bLastKnownEnabled == aUnoState.IsEnabled ) )
+ if ( ( m_aLastKnownState == aUnoState.State ) && ( (m_bLastKnownEnabled ? 1 : 0) == aUnoState.IsEnabled ) )
return;
m_aLastKnownState = aUnoState.State;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index e9e6f22f9db2..8f06ca7e69db 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -133,12 +133,12 @@ namespace svxform
,m_nControlsSelected(0)
,m_nHiddenControls(0)
,m_aTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS )
- ,m_bDragDataDirty(sal_False)
- ,m_bPrevSelectionMixed(sal_False)
- ,m_bMarkingObjects(sal_False)
- ,m_bRootSelected(sal_False)
- ,m_bInitialUpdate(sal_True)
- ,m_bKeyboardCut( sal_False )
+ ,m_bDragDataDirty(false)
+ ,m_bPrevSelectionMixed(false)
+ ,m_bMarkingObjects(false)
+ ,m_bRootSelected(false)
+ ,m_bInitialUpdate(true)
+ ,m_bKeyboardCut( false )
{
SetHelpId( HID_FORM_NAVIGATOR );
@@ -192,7 +192,7 @@ namespace svxform
if (m_bInitialUpdate)
{
GrabFocus();
- m_bInitialUpdate = sal_False;
+ m_bInitialUpdate = false;
}
FmFormShell* pOldShell = GetNavModel()->GetFormShell();
@@ -205,7 +205,7 @@ namespace svxform
if (IsEditingActive())
CancelTextEditing();
- m_bDragDataDirty = sal_True; // sicherheitshalber, auch wenn ich gar nicht dragge
+ m_bDragDataDirty = true; // sicherheitshalber, auch wenn ich gar nicht dragge
}
GetNavModel()->UpdateContent( pFormShell );
@@ -222,49 +222,49 @@ namespace svxform
}
- sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden )
+ bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden )
{
SvTreeListEntry* pCurEntry = GetCurEntry();
if (!pCurEntry)
- return sal_False;
+ return false;
// die Informationen fuer das AcceptDrop und ExecuteDrop
CollectSelectionData(SDI_ALL);
if (m_arrCurrentSelection.empty())
// nothing to do
- return sal_False;
+ return false;
// testen, ob es sich vielleicht ausschliesslich um hidden controls handelt (dann koennte ich pCtrlExch noch ein
// zusaetzliches Format geben)
- sal_Bool bHasNonHidden = sal_False;
+ bool bHasNonHidden = false;
for ( SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin();
it != m_arrCurrentSelection.end(); ++it )
{
FmEntryData* pCurrent = static_cast< FmEntryData* >( (*it)->GetUserData() );
if ( IsHiddenControl( pCurrent ) )
continue;
- bHasNonHidden = sal_True;
+ bHasNonHidden = true;
break;
}
if ( bHasNonHidden && ( 0 == ( _nAction & DND_ACTION_MOVE ) ) )
// non-hidden controls need to be moved
- return sal_False;
+ return false;
if ( _pHasNonHidden )
*_pHasNonHidden = bHasNonHidden;
- return sal_True;
+ return true;
}
- sal_Bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction )
+ bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction )
{
EndSelection();
- sal_Bool bHasNonHidden = sal_False;
+ bool bHasNonHidden = false;
if ( !implAllowExchange( _nAction, &bHasNonHidden ) )
- return sal_False;
+ return false;
m_aControlExchange.prepareDrag();
m_aControlExchange->setFocusEntry( GetCurEntry() );
@@ -289,8 +289,8 @@ namespace svxform
m_aControlExchange->addHiddenControlsFormat(seqIFaces);
}
- m_bDragDataDirty = sal_False;
- return sal_True;
+ m_bDragDataDirty = false;
+ return true;
}
@@ -309,7 +309,7 @@ namespace svxform
void NavigatorTree::Command( const CommandEvent& rEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
switch( rEvt.GetCommand() )
{
case COMMAND_CONTEXTMENU:
@@ -325,7 +325,7 @@ namespace svxform
if ( !IsSelected(ptClickedOn) )
{
SelectAll(false);
- Select(ptClickedOn, sal_True);
+ Select(ptClickedOn, true);
SetCurEntry(ptClickedOn);
}
}
@@ -347,10 +347,10 @@ namespace svxform
// fix wieder raus
if ( (m_arrCurrentSelection.size() > 1) && m_bRootSelected )
{
- Select( m_pRootEntry, sal_False );
+ Select( m_pRootEntry, false );
SetCursor( *m_arrCurrentSelection.begin(), true);
}
- sal_Bool bSingleSelection = (m_arrCurrentSelection.size() == 1);
+ bool bSingleSelection = (m_arrCurrentSelection.size() == 1);
DBG_ASSERT( (m_arrCurrentSelection.size() > 0) || m_bRootSelected, "keine Eintraege selektiert" );
@@ -496,7 +496,7 @@ namespace svxform
case SID_FM_SHOW_PROPERTY_BROWSER:
{
- ShowSelectionProperties(sal_True);
+ ShowSelectionProperties(true);
}
break;
case SID_FM_RENAME_OBJECT:
@@ -526,7 +526,7 @@ namespace svxform
}
}
}
- bHandled = sal_True;
+ bHandled = true;
} break;
}
@@ -608,7 +608,7 @@ namespace svxform
if (pershHint->IsMixedSelection())
// in diesem Fall habe ich alles deselektiert, obwohl die View u.U. eine gemischte Markierung hatte
// ich muss also im naechsten Select den Navigator an die View anpassen
- m_bPrevSelectionMixed = sal_True;
+ m_bPrevSelectionMixed = true;
}
}
@@ -669,7 +669,7 @@ namespace svxform
// ein kleines Problem : ich merke mir meine selektierten Daten, wenn mir jetzt jemand einen selektierten Eintrag
// unter dem Hintern wegschiesst, werde ich inkonsistent ... was schlecht waere
- Select(pEntry, sal_False);
+ Select(pEntry, false);
// beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet
// habe, muss ich mich hinterher darum kuemmern
@@ -686,55 +686,55 @@ namespace svxform
}
- sal_Bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry )
+ bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry )
{
FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
return !pEntryData || pEntryData->ISA(FmFormData);
}
- sal_Bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry )
+ bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry )
{
FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
return pEntryData && pEntryData->ISA(FmControlData);
}
- sal_Bool NavigatorTree::implAcceptPaste( )
+ bool NavigatorTree::implAcceptPaste( )
{
SvTreeListEntry* pFirstSelected = FirstSelected();
if ( !pFirstSelected || NextSelected( pFirstSelected ) )
// no selected entry, or at least two selected entries
- return sal_False;
+ return false;
// get the clipboard
TransferableDataHelper aClipboardContent( TransferableDataHelper::CreateFromSystemClipboard( this ) );
sal_Int8 nAction = m_aControlExchange.isClipboardOwner() && doingKeyboardCut( ) ? DND_ACTION_MOVE : DND_ACTION_COPY;
- return ( nAction == implAcceptDataTransfer( aClipboardContent.GetDataFlavorExVector(), nAction, pFirstSelected, sal_False ) );
+ return ( nAction == implAcceptDataTransfer( aClipboardContent.GetDataFlavorExVector(), nAction, pFirstSelected, false ) );
}
- sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
+ sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, bool _bDnD )
{
return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD );
}
- sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
+ sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD )
{
// no target -> no drop
if (!_pTargetEntry)
return DND_ACTION_NONE;
// format check
- sal_Bool bHasDefControlFormat = OControlExchange::hasFieldExchangeFormat( _rFlavors );
- sal_Bool bHasControlPathFormat = OControlExchange::hasControlPathFormat( _rFlavors );
- sal_Bool bHasHiddenControlsFormat = OControlExchange::hasHiddenControlModelsFormat( _rFlavors );
+ bool bHasDefControlFormat = OControlExchange::hasFieldExchangeFormat( _rFlavors );
+ bool bHasControlPathFormat = OControlExchange::hasControlPathFormat( _rFlavors );
+ bool bHasHiddenControlsFormat = OControlExchange::hasHiddenControlModelsFormat( _rFlavors );
if (!bHasDefControlFormat && !bHasControlPathFormat && !bHasHiddenControlsFormat)
return DND_ACTION_NONE;
- sal_Bool bSelfSource = _bDnD ? m_aControlExchange.isDragSource() : m_aControlExchange.isClipboardOwner();
+ bool bSelfSource = _bDnD ? m_aControlExchange.isDragSource() : m_aControlExchange.isClipboardOwner();
if ( bHasHiddenControlsFormat )
{ // bHasHiddenControlsFormat means that only hidden controls are part of the data
@@ -764,7 +764,7 @@ namespace svxform
// from here on, I can work with m_aControlExchange instead of _rData!
- sal_Bool bForeignCollection = m_aControlExchange->getFormsRoot().get() != GetNavModel()->GetFormPage()->GetForms().get();
+ bool bForeignCollection = m_aControlExchange->getFormsRoot().get() != GetNavModel()->GetFormPage()->GetForms().get();
if ( bForeignCollection )
{
// crossing shell/page boundaries, we can exchange hidden controls only
@@ -789,14 +789,14 @@ namespace svxform
// da die Shell waehrend des Draggens umgeschaltet wude, muss ich die Liste des ExchangeObjektes wieder neu aufbauen
// (dort stehen SvLBoxEntries drin, und die sind bei der Umschaltung floeten gegangen)
m_aControlExchange->buildListFromPath(this, m_pRootEntry);
- m_bDragDataDirty = sal_False;
+ m_bDragDataDirty = false;
}
// die Liste der gedroppten Eintraege aus dem DragServer
const ListBoxEntrySet& aDropped = m_aControlExchange->selected();
DBG_ASSERT(aDropped.size() >= 1, "NavigatorTree::implAcceptDataTransfer: keine Eintraege !");
- sal_Bool bDropTargetIsComponent = IsFormComponentEntry( _pTargetEntry );
+ bool bDropTargetIsComponent = IsFormComponentEntry( _pTargetEntry );
//SvTreeListEntry* pDropTargetParent = GetParent( _pTargetEntry );
// conditions to disallow the drop
@@ -870,19 +870,19 @@ namespace svxform
m_aDropActionTimer.Stop();
} else
{
- sal_Bool bNeedTrigger = sal_False;
+ bool bNeedTrigger = false;
// auf dem ersten Eintrag ?
if ((aDropPos.Y() >= 0) && (aDropPos.Y() < GetEntryHeight()))
{
m_aDropActionType = DA_SCROLLUP;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
} else
// auf dem letzten (bzw. in dem Bereich, den ein Eintrag einnehmen wuerde, wenn er unten genau buendig
// abschliessen wuerde) ?
if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight()))
{
m_aDropActionType = DA_SCROLLDOWN;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
} else
{ // auf einem Entry mit Children, der nicht aufgeklappt ist ?
SvTreeListEntry* pDropppedOn = GetEntry(aDropPos);
@@ -890,7 +890,7 @@ namespace svxform
{
// -> aufklappen
m_aDropActionType = DA_EXPANDNODE;
- bNeedTrigger = sal_True;
+ bNeedTrigger = true;
}
}
@@ -910,17 +910,17 @@ namespace svxform
m_aDropActionTimer.Stop();
}
- return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, aDropPos, sal_True );
+ return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, aDropPos, true );
}
- sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
+ sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const ::Point& _rDropPos, bool _bDnD )
{
return implExecuteDataTransfer( _rData, _nAction, GetEntry( _rDropPos ), _bDnD );
}
- sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
+ sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD )
{
const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector();
@@ -938,8 +938,8 @@ namespace svxform
// format checks
#ifdef DBG_UTIL
- sal_Bool bHasHiddenControlsFormat = OControlExchange::hasHiddenControlModelsFormat( rDataFlavors );
- sal_Bool bForeignCollection = _rData.getFormsRoot().get() != GetNavModel()->GetFormPage()->GetForms().get();
+ bool bHasHiddenControlsFormat = OControlExchange::hasHiddenControlModelsFormat( rDataFlavors );
+ bool bForeignCollection = _rData.getFormsRoot().get() != GetNavModel()->GetFormPage()->GetForms().get();
DBG_ASSERT(!bForeignCollection || bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: invalid format (AcceptDrop shouldn't have let this pass) !");
DBG_ASSERT(bForeignCollection || !m_bDragDataDirty, "NavigatorTree::implExecuteDataTransfer: invalid state (shell changed since last exchange resync) !");
// das sollte in AcceptDrop erledigt worden sein : dort wird in _rData die Liste der Controls aufgebaut und m_bDragDataDirty
@@ -979,7 +979,7 @@ namespace svxform
{
// neues Control anlegen
OUString fControlName = FM_COMPONENT_HIDDEN;
- FmControlData* pNewControlData = NewControl( fControlName, _pTargetEntry, sal_False);
+ FmControlData* pNewControlData = NewControl( fControlName, _pTargetEntry, false);
Reference< XPropertySet > xNewPropSet( pNewControlData->GetPropertySet() );
// und die Properties des alten in das neue kopieren
@@ -1005,7 +1005,7 @@ namespace svxform
}
SvTreeListEntry* pToSelect = FindEntry(pNewControlData);
- Select(pToSelect, sal_True);
+ Select(pToSelect, true);
if (i == 0)
SetCurEntry(pToSelect);
}
@@ -1024,7 +1024,7 @@ namespace svxform
}
// some data for the target
- sal_Bool bDropTargetIsForm = IsFormEntry(_pTargetEntry);
+ bool bDropTargetIsForm = IsFormEntry(_pTargetEntry);
FmFormData* pTargetData = bDropTargetIsForm ? (FmFormData*)_pTargetEntry->GetUserData() : NULL;
DBG_ASSERT( DND_ACTION_COPY != _nAction, "NavigatorTree::implExecuteDataTransfer: somebody changed the logics!" );
@@ -1101,7 +1101,7 @@ namespace svxform
xContainer->removeByIndex(nIndex);
// die Selection raus
- Select(pCurrent, sal_False);
+ Select(pCurrent, false);
// und weg
Remove(pCurrentUserData);
@@ -1187,11 +1187,11 @@ namespace svxform
sal_Int8 nResult( DND_ACTION_NONE );
if ( m_aControlExchange.isDragSource() )
- nResult = implExecuteDataTransfer( *m_aControlExchange, rEvt.mnAction, rEvt.maPosPixel, sal_True );
+ nResult = implExecuteDataTransfer( *m_aControlExchange, rEvt.mnAction, rEvt.maPosPixel, true );
else
{
OControlTransferData aDroppedData( rEvt.maDropEvent.Transferable );
- nResult = implExecuteDataTransfer( aDroppedData, rEvt.mnAction, rEvt.maPosPixel, sal_True );
+ nResult = implExecuteDataTransfer( aDroppedData, rEvt.mnAction, rEvt.maPosPixel, true );
}
return nResult;
@@ -1204,7 +1204,7 @@ namespace svxform
{
if ( m_aControlExchange.isClipboardOwner() )
{
- implExecuteDataTransfer( *m_aControlExchange, doingKeyboardCut( ) ? DND_ACTION_MOVE : DND_ACTION_COPY, FirstSelected(), sal_False );
+ implExecuteDataTransfer( *m_aControlExchange, doingKeyboardCut( ) ? DND_ACTION_MOVE : DND_ACTION_COPY, FirstSelected(), false );
}
else
{
@@ -1215,7 +1215,7 @@ namespace svxform
xTransferable = xClipboard->getContents();
OControlTransferData aClipboardContent( xTransferable );
- implExecuteDataTransfer( aClipboardContent, DND_ACTION_COPY, FirstSelected(), sal_False );
+ implExecuteDataTransfer( aClipboardContent, DND_ACTION_COPY, FirstSelected(), false );
}
}
catch( const Exception& )
@@ -1259,7 +1259,7 @@ namespace svxform
{
m_aControlExchange.setClipboardListener( LINK( this, NavigatorTree, OnClipboardAction ) );
m_aControlExchange.copyToClipboard( );
- m_bKeyboardCut = sal_True;
+ m_bKeyboardCut = true;
// mark all the entries we just "cut" into the clipboard as "nearly moved"
for ( SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin();
@@ -1362,7 +1362,7 @@ namespace svxform
// Form einfuegen
- GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, sal_True );
+ GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, true );
// Neue Form als aktive Form setzen
@@ -1384,7 +1384,7 @@ namespace svxform
}
- FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName )
+ FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName )
{
// ParentForm holen
@@ -1417,7 +1417,7 @@ namespace svxform
// FormComponent einfuegen
- GetNavModel()->Insert( pNewFormControlData, TREELIST_APPEND, sal_True );
+ GetNavModel()->Insert( pNewFormControlData, TREELIST_APPEND, true );
GetNavModel()->SetModified();
if (bEditName)
@@ -1425,7 +1425,7 @@ namespace svxform
// In EditMode schalten
SvTreeListEntry* pNewEntry = FindEntry( pNewFormControlData );
- Select( pNewEntry, sal_True );
+ Select( pNewEntry, true );
EditEntry( pNewEntry );
}
@@ -1459,7 +1459,7 @@ namespace svxform
aNewName += OUString::number(i).getStr();
}
- if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL )
+ if( GetNavModel()->FindData(aNewName, pFormParentData,false) == NULL )
break;
}
@@ -1579,14 +1579,14 @@ namespace svxform
ListBoxEntrySet aEmpty;
m_aCutEntries.swap( aEmpty );
- m_bKeyboardCut = sal_False;
+ m_bKeyboardCut = false;
}
}
return 0L;
}
- void NavigatorTree::ShowSelectionProperties(sal_Bool bForce)
+ void NavigatorTree::ShowSelectionProperties(bool bForce)
{
// zuerst brauche ich die FormShell
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
@@ -1602,7 +1602,7 @@ namespace svxform
InterfaceBag aSelection;
- sal_Bool bSetSelectionAsMarkList = sal_False;
+ bool bSetSelectionAsMarkList = false;
if (m_bRootSelected)
; // no properties for the root, neither for single nor for multi selection
@@ -1653,7 +1653,7 @@ namespace svxform
}
else if (m_nHiddenControls == 0)
{ // nur normale Controls
- bSetSelectionAsMarkList = sal_True;
+ bSetSelectionAsMarkList = true;
}
}
}
@@ -1677,10 +1677,10 @@ namespace svxform
void NavigatorTree::DeleteSelection()
{
// die Root darf ich natuerlich nicht mitloeschen
- sal_Bool bRootSelected = IsSelected(m_pRootEntry);
+ bool bRootSelected = IsSelected(m_pRootEntry);
sal_uIntPtr nSelectedEntries = GetSelectionCount();
if (bRootSelected && (nSelectedEntries > 1)) // die Root plus andere Elemente ?
- Select(m_pRootEntry, sal_False); // ja -> die Root raus
+ Select(m_pRootEntry, false); // ja -> die Root raus
if ((nSelectedEntries == 0) || bRootSelected) // immer noch die Root ?
return; // -> sie ist das einzige selektierte -> raus
@@ -1718,23 +1718,23 @@ namespace svxform
// form). The other way round, the EntryDatas would be invalid, if I'd first delete the controls and
// then go on to the strucure. This means I have to delete the forms *after* the normal controls, so
// that during UNDO, they're restored in the proper order.
- pFormShell->GetImpl()->EnableTrackProperties(sal_False);
+ pFormShell->GetImpl()->EnableTrackProperties(false);
for (SvLBoxEntrySortedArray::reverse_iterator it = m_arrCurrentSelection.rbegin();
it != m_arrCurrentSelection.rend(); )
{
FmEntryData* pCurrent = (FmEntryData*)((*it)->GetUserData());
// eine Form ?
- sal_Bool bIsForm = pCurrent->ISA(FmFormData);
+ bool bIsForm = pCurrent->ISA(FmFormData);
// da ich das Loeschen im folgenden der View ueberlasse und dabei auf deren MarkList aufbaue, im Normalfall aber bei
// einem makierten Formular nur die direkt, nicht die indirekt abhaengigen Controls markiert werden, muss ich das hier
// noch nachholen
if (bIsForm)
- MarkViewObj((FmFormData*)pCurrent, sal_True, sal_True); // das zweite sal_True heisst "deep"
+ MarkViewObj((FmFormData*)pCurrent, true, true); // das zweite sal_True heisst "deep"
// ein hidden control ?
- sal_Bool bIsHidden = IsHiddenControl(pCurrent);
+ bool bIsHidden = IsHiddenControl(pCurrent);
// Forms und hidden Controls muss ich behalten, alles andere nicht
if (!bIsForm && !bIsHidden)
@@ -1759,7 +1759,7 @@ namespace svxform
else
++it;
}
- pFormShell->GetImpl()->EnableTrackProperties(sal_True);
+ pFormShell->GetImpl()->EnableTrackProperties(true);
// let the view delete the marked controls
pFormShell->GetFormView()->DeleteMarked();
@@ -1809,7 +1809,7 @@ namespace svxform
if ( pFormShell->GetImpl()->getCurrentForm() == xCurrentForm ) // die Shell kennt die zu loeschende Form ?
pFormShell->GetImpl()->forgetCurrentForm(); // -> wegnehmen ...
}
- GetNavModel()->Remove(pCurrent, sal_True);
+ GetNavModel()->Remove(pCurrent, true);
}
pFormModel->EndUndo();
}
@@ -1823,14 +1823,14 @@ namespace svxform
m_arrCurrentSelection.clear();
m_nFormsSelected = m_nControlsSelected = m_nHiddenControls = 0;
- m_bRootSelected = sal_False;
+ m_bRootSelected = false;
SvTreeListEntry* pSelectionLoop = FirstSelected();
while (pSelectionLoop)
{
// erst mal die Zaehlung der verschiedenen Elemente
if (pSelectionLoop == m_pRootEntry)
- m_bRootSelected = sal_True;
+ m_bRootSelected = true;
else
{
if (IsFormEntry(pSelectionLoop))
@@ -1912,14 +1912,14 @@ namespace svxform
arredToSelect.erase(it);
} else
{ // der Entry ist selektiert, aber steht nicht in der SelectList -> Selektion rausnehmen
- Select(pSelection, sal_False);
+ Select(pSelection, false);
// und sichtbar machen (kann ja sein, dass das die einzige Modifikation ist, die ich hier in dem
// ganzen Handler mache, dann sollte das zu sehen sein)
MakeVisible(pSelection);
}
}
else
- Select(pSelection, sal_False);
+ Select(pSelection, false);
pSelection = NextSelected(pSelection);
}
@@ -1940,7 +1940,7 @@ namespace svxform
FmEntryDataArray::iterator it = arredToSelect.find(pCurEntryData);
if ( it != arredToSelect.end() )
{
- Select(pLoop, sal_True);
+ Select(pLoop, true);
MakeVisible(pLoop);
SetCursor(pLoop, true);
}
@@ -1974,7 +1974,7 @@ namespace svxform
CollectSelectionData(SDI_NORMALIZED_FORMARK);
// Die View soll jetzt kein Notify bei einer Aenderung der MarkList rauslassen
- pFormShell->GetImpl()->EnableTrackProperties(sal_False);
+ pFormShell->GetImpl()->EnableTrackProperties(false);
UnmarkAllViewObj();
@@ -1984,7 +1984,7 @@ namespace svxform
SvTreeListEntry* pSelectionLoop = *it;
// Bei Formselektion alle Controls dieser Form markieren
if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry))
- MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False);
+ MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), true, false);
// Bei Controlselektion Control-SdrObjects markieren
else if (IsFormComponentEntry(pSelectionLoop))
@@ -2003,7 +2003,7 @@ namespace svxform
sal_uInt16 nClassId = ::comphelper::getINT16(xSet->getPropertyValue(FM_PROP_CLASSID));
if (nClassId != FormComponentType::HIDDENCONTROL)
- MarkViewObj(pControlData, sal_True, sal_True);
+ MarkViewObj(pControlData, true, true);
}
}
}
@@ -2012,10 +2012,10 @@ namespace svxform
// (NICHT entsprechend der MarkList der View : wenn ich ein Formular selektiert habe, sind in der
// View alle zugehoerigen Controls markiert, trotzdem moechte ich natuerlich die Formular-Eigenschaften
// sehen)
- ShowSelectionProperties(sal_False);
+ ShowSelectionProperties(false);
// Flag an View wieder zuruecksetzen
- pFormShell->GetImpl()->EnableTrackProperties(sal_True);
+ pFormShell->GetImpl()->EnableTrackProperties(true);
// wenn jetzt genau eine Form selektiert ist, sollte die Shell das als CurrentForm mitbekommen
// (wenn SelectionHandling nicht locked ist, kuemmert sich die View eigentlich in MarkListHasChanged drum,
@@ -2034,9 +2034,9 @@ namespace svxform
}
- sal_Bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData)
+ bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData)
{
- if (pEntryData == NULL) return sal_False;
+ if (pEntryData == NULL) return false;
Reference< XPropertySet > xProperties( pEntryData->GetPropertySet() );
if (::comphelper::hasProperty(FM_PROP_CLASSID, xProperties))
@@ -2044,14 +2044,14 @@ namespace svxform
Any aClassID = xProperties->getPropertyValue( FM_PROP_CLASSID );
return (::comphelper::getINT16(aClassID) == FormComponentType::HIDDENCONTROL);
}
- return sal_False;
+ return false;
}
- sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
+ bool NavigatorTree::Select( SvTreeListEntry* pEntry, bool bSelect )
{
- if (bSelect == (IsSelected(pEntry) ? 1 : 0)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
- return sal_True;
+ if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
+ return true;
return SvTreeListBox::Select(pEntry, bSelect );
}
@@ -2066,7 +2066,7 @@ namespace svxform
pFormView->UnMarkAll();
}
- void NavigatorTree::MarkViewObj(FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep )
+ void NavigatorTree::MarkViewObj(FmFormData* pFormData, bool bMark, bool bDeep )
{
FmFormShell* pFormShell = GetNavModel()->GetFormShell();
if( !pFormShell )
@@ -2092,7 +2092,7 @@ namespace svxform
continue;
Reference< XFormComponent > xControlModel( pFormObject->GetUnoControlModel(),UNO_QUERY );
- if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) )
+ if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != pFormView->IsObjMarked( pSdrObject ) )
{
// unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
pFormView->MarkObj( pSdrObject, pPageView, !bMark, false );
@@ -2114,7 +2114,7 @@ namespace svxform
}
}
- void NavigatorTree::CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects)
+ void NavigatorTree::CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects)
{
FmEntryDataList* pChildList = pFormData->GetChildList();
FmEntryData* pEntryData;
@@ -2132,7 +2132,7 @@ namespace svxform
} // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
}
- void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark)
+ void NavigatorTree::MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark)
{
if( !pControlData )
return;
@@ -2161,7 +2161,7 @@ namespace svxform
continue;
// mark the object
- if ( bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) )
+ if ( bMark != pFormView->IsObjMarked( pSdrObject ) )
// unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
pFormView->MarkObj( pSdrObject, pPageView, !bMark, false );
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 73bb8f08bfef..1f57c80d6e00 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -60,7 +60,7 @@ namespace svxform
OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel)
:m_pNavModel(_pModel)
,m_nLocks(0)
- ,m_bCanUndo(sal_True)
+ ,m_bCanUndo(true)
{
}
@@ -103,13 +103,13 @@ namespace svxform
return;
// keine Undoaction einfuegen
- m_bCanUndo = sal_False;
+ m_bCanUndo = false;
Reference< XInterface > xTemp;
evt.Element >>= xTemp;
Insert(xTemp, ::comphelper::getINT32(evt.Accessor));
- m_bCanUndo = sal_True;
+ m_bCanUndo = true;
}
@@ -141,12 +141,12 @@ namespace svxform
if (IsLocked() || !m_pNavModel)
return;
- m_bCanUndo = sal_False;
+ m_bCanUndo = false;
// EntryData loeschen
Reference< XFormComponent > xReplaced;
evt.ReplacedElement >>= xReplaced;
- FmEntryData* pEntryData = m_pNavModel->FindData(xReplaced, m_pNavModel->GetRootList(), sal_True);
+ FmEntryData* pEntryData = m_pNavModel->FindData(xReplaced, m_pNavModel->GetRootList(), true);
if (pEntryData)
{
if (pEntryData->ISA(FmControlData))
@@ -163,7 +163,7 @@ namespace svxform
}
}
- m_bCanUndo = sal_True;
+ m_bCanUndo = true;
}
@@ -172,15 +172,15 @@ namespace svxform
if (IsLocked() || !m_pNavModel)
return;
- m_bCanUndo = sal_False;
+ m_bCanUndo = false;
// EntryData loeschen
- FmEntryData* pEntryData = m_pNavModel->FindData( _rxElement, m_pNavModel->GetRootList(), sal_True );
+ FmEntryData* pEntryData = m_pNavModel->FindData( _rxElement, m_pNavModel->GetRootList(), true );
if (pEntryData)
m_pNavModel->Remove(pEntryData);
- m_bCanUndo = sal_True;
+ m_bCanUndo = true;
}
@@ -230,7 +230,7 @@ namespace svxform
- void NavigatorTreeModel::SetModified( sal_Bool bMod )
+ void NavigatorTreeModel::SetModified( bool bMod )
{
if( !m_pFormShell ) return;
SfxObjectShell* pObjShell = m_pFormShell->GetFormModel()->GetObjectShell();
@@ -265,7 +265,7 @@ namespace svxform
}
- void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
+ void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, bool bAlterModel)
{
if (IsListening(*m_pFormModel))
EndListening(*m_pFormModel);
@@ -364,7 +364,7 @@ namespace svxform
}
- void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel)
+ void NavigatorTreeModel::Remove(FmEntryData* pEntry, bool bAlterModel)
{
// Form und Parent holen
@@ -617,7 +617,7 @@ namespace svxform
Insert( pParentData, CONTAINER_APPEND );
}
- if (!FindData(xComp, pParentData->GetChildList(),sal_False))
+ if (!FindData(xComp, pParentData->GetChildList(),false))
{
// Neue EntryData setzen
@@ -635,7 +635,7 @@ namespace svxform
const Reference< XFormComponent > & xNew
)
{
- FmEntryData* pData = FindData(xOld, GetRootList(), sal_True);
+ FmEntryData* pData = FindData(xOld, GetRootList(), true);
DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
@@ -644,7 +644,7 @@ namespace svxform
}
- FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, sal_Bool bRecurs)
+ FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, bool bRecurs)
{
// normalize
Reference< XInterface > xIFace( xElement, UNO_QUERY );
@@ -665,7 +665,7 @@ namespace svxform
}
- FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
+ FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs )
{
FmEntryDataList* pDataList;
if( !pParentData )
@@ -762,7 +762,7 @@ namespace svxform
try
{
Reference< XFormComponent > xFormComponent( pFormObject->GetUnoControlModel(), UNO_QUERY_THROW );
- FmEntryData* pEntryData = FindData( xFormComponent, GetRootList(), sal_True );
+ FmEntryData* pEntryData = FindData( xFormComponent, GetRootList(), true );
if ( pEntryData )
Remove( pEntryData );
}
@@ -779,7 +779,7 @@ namespace svxform
}
}
- sal_Bool NavigatorTreeModel::InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject)
+ bool NavigatorTreeModel::InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject)
{
if ( pObject->ISA(SdrObjGroup) )
{ // rekursiv absteigen
@@ -788,33 +788,33 @@ namespace svxform
{
SdrObject* pCurrent = pChildren->GetObj(i);
if (!InsertFormComponent(rHint, pCurrent))
- return sal_False;
+ return false;
}
}
else
{
FmFormObj* pFormObject = FmFormObj::GetFormObject( pObject );
if ( !pFormObject )
- return sal_False;
+ return false;
try
{
Reference< XFormComponent > xFormViewControl( pFormObject->GetUnoControlModel(), UNO_QUERY_THROW );
FmEntryData* pControlData = FindData( xFormViewControl, GetRootList() );
if ( !pControlData )
- return sal_False;
+ return false;
rHint.AddItem( pControlData );
- return sal_True;
+ return true;
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
void NavigatorTreeModel::BroadcastMarkedObjects(const SdrMarkList& mlMarked)
@@ -913,7 +913,7 @@ namespace svxform
}
- sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText )
+ bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText )
{
// Wenn Name schon vorhanden, Fehlermeldung
@@ -936,15 +936,15 @@ namespace svxform
xFormComponent = pControlData->GetFormComponent();
}
- if( !xFormComponent.is() ) return sal_False;
+ if( !xFormComponent.is() ) return false;
Reference< XPropertySet > xSet(xFormComponent, UNO_QUERY);
- if( !xSet.is() ) return sal_False;
+ if( !xSet.is() ) return false;
// Namen setzen
xSet->setPropertyValue( FM_PROP_NAME, makeAny(rNewText) );
- return sal_True;
+ return true;
}
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index fdab67e51f78..676d4cc11a09 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -86,7 +86,7 @@ namespace svxform
}
// XColumn
- sal_Bool DataColumn::wasNull() throw( SQLException, RuntimeException )
+ bool DataColumn::wasNull() throw( SQLException, RuntimeException )
{
return m_xColumn->wasNull();
}
@@ -96,7 +96,7 @@ namespace svxform
return m_xColumn->getString();
}
- sal_Bool DataColumn::getBoolean() throw( SQLException, RuntimeException )
+ bool DataColumn::getBoolean() throw( SQLException, RuntimeException )
{
return m_xColumn->getBoolean();
}
@@ -192,7 +192,7 @@ namespace svxform
m_xColumnUpdate->updateNull();
}
- void DataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeException )
+ void DataColumn::updateBoolean(bool x) throw( SQLException, RuntimeException )
{
m_xColumnUpdate->updateBoolean(x);
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 66109e29b356..d1edce99b220 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -224,7 +224,7 @@ void FmFieldWin::GetFocus()
}
-sal_Bool FmFieldWin::createSelectionControls( )
+bool FmFieldWin::createSelectionControls( )
{
SvTreeListEntry* pSelected = pListBox->FirstSelected();
if ( pSelected )
@@ -336,7 +336,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su
// get the connection of the form
OStaticDataAccessTools aTools;
m_aConnection.reset(
- aTools.connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), sal_True ),
+ aTools.connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), true ),
SharedConnection::NoTakeOwnership
);
// TODO: When incompatible changes (such as extending the "virtualdbtools" interface by ensureRowSetConnection)
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a3018438f5b0..a35b82d71fea 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -277,7 +277,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
pWin->SetValue( pItem ? pItem->GetValue() : -1 );
}
- sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
+ bool bEnable = SFX_ITEM_DISABLED != eState && pState;
if (!bEnable)
pWin->SetText(OUString());
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 2bb139bdd7b6..c1dadb2f5e74 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -170,10 +170,10 @@ void GalleryControl::Resize (void)
maLastSize = aNewSize;
}
-sal_Bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* )
+bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* )
{
const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
- sal_Bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
+ bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) );
if( bRet )
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 241c20a60f16..8d3264e355f1 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -35,10 +35,10 @@ GalleryCodec::~GalleryCodec()
{
}
-sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
+bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
{
const sal_uIntPtr nPos = rStm.Tell();
- sal_Bool bRet;
+ bool bRet;
sal_uInt8 cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
rStm.ReadUChar( cByte1 ).ReadUChar( cByte2 ).ReadUChar( cByte3 ).ReadUChar( cByte4 ).ReadUChar( cByte5 ).ReadUChar( cByte6 );
@@ -46,12 +46,12 @@ sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
if ( cByte1 == 'S' && cByte2 == 'V' && cByte3 == 'R' && cByte4 == 'L' && cByte5 == 'E' && ( cByte6 == '1' || cByte6 == '2' ) )
{
rVersion = ( ( cByte6 == '1' ) ? 1 : 2 );
- bRet = sal_True;
+ bRet = true;
}
else
{
rVersion = 0;
- bRet = sal_False;
+ bRet = false;
}
rStm.Seek( nPos );
@@ -104,7 +104,7 @@ void GalleryCodec::Read( SvStream& rStmToRead )
sal_uInt8* pTmpBuf = pOutBuf;
sal_uInt8* pLast = pOutBuf + nUnCompressedSize - 1;
sal_uIntPtr nIndex = 0UL, nCountByte, nRunByte;
- sal_Bool bEndDecoding = sal_False;
+ bool bEndDecoding = false;
do
{
@@ -126,7 +126,7 @@ void GalleryCodec::Read( SvStream& rStmToRead )
pInBuf++;
}
else if ( nRunByte == 1 ) // End of the image
- bEndDecoding = sal_True;
+ bEndDecoding = true;
}
else
{
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 42417ddc7c35..0230d7eabedb 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -34,7 +34,7 @@ public:
void Write( SvStream& rStmToWrite );
void Read( SvStream& rStmToRead );
- static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
+ static bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 080ba5565251..ddb56e1d6dd9 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -164,7 +164,7 @@ GalleryBrowser1::~GalleryBrowser1()
sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
{
- static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
+ static const bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND;
@@ -231,18 +231,18 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
if( pTheme )
{
- sal_Bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
- static const sal_Bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
+ bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
+ static const bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
if( pTheme->IsReadOnly() )
- bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
+ bUpdateAllowed = bRenameAllowed = bRemoveAllowed = false;
else if( pTheme->IsDefault() )
{
- bUpdateAllowed = bRenameAllowed = sal_True;
- bRemoveAllowed = sal_False;
+ bUpdateAllowed = bRenameAllowed = true;
+ bRemoveAllowed = false;
}
else
- bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True;
+ bUpdateAllowed = bRenameAllowed = bRemoveAllowed = true;
if( bUpdateAllowed && pTheme->GetObjectCount() )
o_aExec.push_back( MN_ACTUALIZE );
@@ -518,9 +518,9 @@ void GalleryBrowser1::ShowContextMenu()
Application::PostUserEvent( LINK( this, GalleryBrowser1, ShowContextMenuHdl ), this );
}
-sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
{
- sal_Bool bRet (sal_False);
+ bool bRet = false;
if (maKeyInputHandler)
bRet = maKeyInputHandler(rKEvt, pWindow);
@@ -529,7 +529,7 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
::std::vector< sal_uInt16 > aExecVector;
ImplGetExecuteVector(aExecVector);
sal_uInt16 nExecuteId = 0;
- sal_Bool bMod1 = rKEvt.GetKeyCode().IsMod1();
+ bool bMod1 = rKEvt.GetKeyCode().IsMod1();
switch( rKEvt.GetKeyCode().GetCode() )
{
@@ -580,7 +580,7 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( nExecuteId && ( ::std::find( aExecVector.begin(), aExecVector.end(), nExecuteId ) != aExecVector.end() ) )
{
ImplExecute( nExecuteId );
- bRet = sal_True;
+ bRet = true;
}
}
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 8269f60b96e8..c4ac5709c745 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -130,7 +130,7 @@ public:
OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : OUString(); }
void ShowContextMenu();
- sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+ bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index cb00371f3f4d..20e0ef7b3fe7 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -109,7 +109,7 @@ class GalleryThemePopup : public ::cppu::WeakImplHelper1< css::frame::XStatusLis
private:
const GalleryTheme* mpTheme;
sal_uIntPtr mnObjectPos;
- sal_Bool mbPreview;
+ bool mbPreview;
PopupMenu maPopupMenu;
PopupMenu maBackgroundPopup;
GalleryBrowser2* mpBrowser;
@@ -125,7 +125,7 @@ private:
public:
GalleryThemePopup( const GalleryTheme* pTheme,
sal_uIntPtr nObjectPos,
- sal_Bool bPreview,
+ bool bPreview,
GalleryBrowser2* pBrowser );
virtual ~GalleryThemePopup();
@@ -139,7 +139,7 @@ public:
GalleryThemePopup::GalleryThemePopup(
const GalleryTheme* pTheme,
sal_uIntPtr nObjectPos,
- sal_Bool bPreview,
+ bool bPreview,
GalleryBrowser2* pBrowser )
: mpTheme( pTheme )
, mnObjectPos( nObjectPos )
@@ -238,7 +238,7 @@ void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos )
INetURLObject aURL;
const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL );
- const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+ const bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
maPopupMenu.EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind );
@@ -651,12 +651,12 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
}
}
-sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
{
Point aSelPos;
const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
GalleryBrowser* pParentBrowser = dynamic_cast<GalleryBrowser*>(GetParent());
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if (pParentBrowser != NULL)
bRet = pParentBrowser->KeyInput( rKEvt, pWindow );
else
@@ -673,15 +673,15 @@ sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
- const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
- sal_Bool bPreview = bValidURL;
- sal_Bool bDelete = sal_False;
- sal_Bool bTitle = sal_False;
+ const bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+ bool bPreview = bValidURL;
+ bool bDelete = false;
+ bool bTitle = false;
if( !mpCurTheme->IsReadOnly() && mpCurTheme->GetObjectCount() )
{
bDelete = ( GALLERYBROWSERMODE_PREVIEW != GetMode() );
- bTitle = sal_True;
+ bTitle = true;
}
switch( rKEvt.GetKeyCode().GetCode() )
@@ -693,7 +693,7 @@ sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( bPreview )
{
TogglePreview( pWindow );
- bRet = sal_True;
+ bRet = true;
}
}
break;
@@ -705,7 +705,7 @@ sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( bValidURL )
{
Dispatch( MN_ADD );
- return sal_True;
+ return true;
}
}
break;
@@ -732,7 +732,7 @@ sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( nExecuteId )
{
Execute( nExecuteId );
- bRet = sal_True;
+ bRet = true;
}
}
@@ -1131,7 +1131,7 @@ void GalleryBrowser2::Dispatch(
}
Graphic aGraphic;
- sal_Bool bGraphic = mpCurTheme->GetGraphic( mnCurActionPos, aGraphic );
+ bool bGraphic = mpCurTheme->GetGraphic( mnCurActionPos, aGraphic );
if ( bGraphic && !!aGraphic )
xGraphic.set( aGraphic.GetXGraphic() );
OSL_ENSURE( xGraphic.is(), "gallery item is graphic, but the reference is invalid!" );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 3a3c53be7cfb..da73fbb8be6a 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -280,7 +280,7 @@ bool GalleryExplorer::EndLocking( const OUString& rThemeName )
if( pTheme )
{
- const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme();
+ const bool bReleaseLockedTheme = pTheme->UnlockTheme();
// release acquired theme
pGal->ReleaseTheme( pTheme, aListener );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index b28a02653403..09b1ded2c294 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -287,7 +287,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( s_sSDG_EXT );
INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( s_sSDV_EXT );
OUString aTitle;
- sal_Bool bReadOnly = sal_False;
+ bool bReadOnly = false;
try
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 57b3c2ada350..e89658761cdd 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -335,7 +335,7 @@ bool KillFile( const INetURLObject& rURL )
try
{
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- aCnt.executeCommand( OUString("delete"), uno::makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString("delete"), uno::makeAny( true ) );
}
catch( const ucb::ContentCreationException& )
{
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 2c2092129fc3..70196d448241 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -43,8 +43,8 @@
using namespace ::com::sun::star;
SgaObject::SgaObject()
-: bIsValid ( sal_False ),
- bIsThumbBmp ( sal_True )
+: bIsValid ( false ),
+ bIsThumbBmp ( true )
{
}
@@ -90,9 +90,9 @@ BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const
return aRetval;
}
-sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
+bool SgaObject::CreateThumb( const Graphic& rGraphic )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -127,7 +127,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = sal_True;
+ bRet = true;
}
else
{
@@ -140,7 +140,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
BMP_SCALE_BESTQUALITY ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -161,7 +161,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
if( !aThumbBmp.IsEmpty() )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = sal_True;
+ bRet = true;
}
}
@@ -201,7 +201,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
sal_uInt32 nTmp32;
sal_uInt16 nTmp16;
- rIn.ReadUInt32( nTmp32 ).ReadUInt16( nTmp16 ).ReadUInt16( rReadVersion ).ReadUInt16( nTmp16 ).ReadUChar( bIsThumbBmp );
+ rIn.ReadUInt32( nTmp32 ).ReadUInt16( nTmp16 ).ReadUInt16( rReadVersion ).ReadUInt16( nTmp16 ).ReadCharAsBool( bIsThumbBmp );
if( bIsThumbBmp )
{
@@ -329,10 +329,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
{
aURL = rURL;
aThumbBmp = Bitmap( Size( 1, 1 ), 1 );
- bIsValid = sal_True;
+ bIsValid = true;
}
else
- bIsValid = sal_False;
+ bIsValid = false;
}
SgaObjectSound::~SgaObjectSound()
@@ -464,11 +464,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
}
}
-sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
+bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
{
Graphic aGraphic;
ImageMap aImageMap;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) )
{
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index a7f027228a20..50ec15a2178a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -239,7 +239,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt
INetURLObject aNewURL;
sal_uInt32 nNextNumber = 1999;
sal_Char const* pExt = NULL;
- sal_Bool bExists;
+ bool bExists;
aDir.Append( OUString("dragdrop") );
CreateDir( aDir );
@@ -288,12 +288,12 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt
OUString aFileName( "gallery/svdraw/dd" );
aNewURL = INetURLObject( aFileName += OUString::number( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE );
- bExists = sal_False;
+ bExists = false;
for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
if ( aObjectList[ i ]->aURL == aNewURL )
{
- bExists = sal_True;
+ bExists = true;
break;
}
}
@@ -693,7 +693,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
{
OUString aThemeName;
sal_uInt16 nVersion;
- sal_Bool bThemeNameFromResource = sal_False;
+ bool bThemeNameFromResource = false;
pIStm->ReadUInt16( nVersion );
@@ -732,7 +732,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
if( pCompat->GetVersion() >= 2 )
{
- pIStm->ReadUChar( bThemeNameFromResource );
+ pIStm->ReadCharAsBool( bThemeNameFromResource );
}
delete pCompat;
@@ -1131,7 +1131,7 @@ bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_u
try
{
::ucbhelper::Content aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- sal_Bool bFolder = false;
+ bool bFolder = false;
aCnt.getPropertyValue("IsFolder") >>= bFolder;
@@ -1292,7 +1292,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
const INetURLObject aRelURL1( GetParent()->GetRelativeURL() );
const INetURLObject aRelURL2( GetParent()->GetUserURL() );
sal_uInt32 nCount = GetObjectCount();
- sal_Bool bRel;
+ bool bRel;
rOStm.WriteUInt16( (sal_uInt16) 0x0004 );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
@@ -1306,7 +1306,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
if( SGA_OBJ_SVDRAW == pObj->eObjKind )
{
aPath = GetSvDrawStreamNameFromURL( pObj->aURL );
- bRel = sal_False;
+ bRel = false;
}
else
{
@@ -1404,7 +1404,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
INetURLObject aRelURL1( GetParent()->GetRelativeURL() );
INetURLObject aRelURL2( GetParent()->GetUserURL() );
sal_uInt32 nId1, nId2;
- sal_Bool bRel;
+ bool bRel;
for( size_t i = 0, n = aObjectList.size(); i < n; ++i )
{
@@ -1423,7 +1423,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
OUString aPath;
sal_uInt16 nTemp;
- rIStm.ReadUChar( bRel );
+ rIStm.ReadCharAsBool( bRel );
OString aTempFileName = read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm);
rIStm.ReadUInt32( pObj->nOffset );
rIStm.ReadUInt16( nTemp ); pObj->eObjKind = (SgaObjKind) nTemp;
@@ -1489,13 +1489,13 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
{
VersionCompat* pCompat = new VersionCompat( rIStm, STREAM_READ );
sal_uInt32 nTemp32;
- sal_Bool bThemeNameFromResource = sal_False;
+ bool bThemeNameFromResource = false;
rIStm.ReadUInt32( nTemp32 );
if( pCompat->GetVersion() >= 2 )
{
- rIStm.ReadUChar( bThemeNameFromResource );
+ rIStm.ReadCharAsBool( bThemeNameFromResource );
}
SetId( nTemp32, bThemeNameFromResource );
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index ef485cdf2889..c829f3a7aa93 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -85,9 +85,9 @@ public:
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual bool SAL_CALL isFocusTraversable( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -105,7 +105,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void Invalidate();
- void NotifyFocusListeners(sal_Bool bGetFocus);
+ void NotifyFocusListeners(bool bGetFocus);
void NotifyAccessibleEvent( const sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue );
protected:
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index fc96dedd1bba..4ef172f816e8 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -247,7 +247,7 @@ private:
/// client id in the AccessibleEventNotifier queue
sal_uInt32 mnClientId;
- sal_Bool mbDisposed;
+ bool mbDisposed;
};
#endif
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 59f312a7b3e2..8ce4a55ec94f 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -696,7 +696,7 @@ class BrokenRecoveryDialog : public ModalDialog
OUString m_sSavePath;
RecoveryCore* m_pCore;
bool m_bBeforeRecovery;
- sal_Bool m_bExecutionNeeded;
+ bool m_bExecutionNeeded;
// interface
@@ -714,7 +714,7 @@ class BrokenRecoveryDialog : public ModalDialog
/** @short TODO */
- virtual sal_Bool isExecutionNeeded();
+ virtual bool isExecutionNeeded();
/** @short TODO */
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 8e86bab8f356..3530dbe1d9f9 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -172,7 +172,7 @@ public:
void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent);
void Clear();
- sal_Bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const;
+ bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const;
void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
void SetTextForItem(FmFilterItem* pItem, const OUString& rText);
@@ -207,7 +207,7 @@ public:
OFilterItemExchange();
static sal_uInt32 getFormatId( );
- inline static sal_Bool hasFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasFormat( const DataFlavorExVector& _rFormats );
const ::std::vector<FmFilterItem*>& getDraggedEntries() const { return m_aDraggedEntries; }
void setDraggedEntries(const ::std::vector<FmFilterItem*>& _rList) { m_aDraggedEntries = _rList; }
@@ -220,7 +220,7 @@ protected:
virtual void AddSupportedFormats() SAL_OVERRIDE;
};
-inline sal_Bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats )
+inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats )
{
return OLocalExchange::hasFormat( _rFormats, getFormatId() );
}
@@ -271,7 +271,7 @@ protected:
virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
- virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+ virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) SAL_OVERRIDE;
virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
@@ -304,7 +304,7 @@ private:
@param _bCopy
If <TRUE/> the items will not be removed from the model, otherwise they will.
*/
- void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False);
+ void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems, bool _bCopy = false);
SvTreeListEntry* getPrevEntry(SvTreeListEntry* _pStartWith = NULL);
SvTreeListEntry* getNextEntry(SvTreeListEntry* _pStartWith = NULL);
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 126121eacda3..bdd5cad691ce 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -42,7 +42,7 @@ class FmFormShell;
class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem
{
- sal_Bool m_bInitialStateChange;
+ bool m_bInitialStateChange;
bool m_bInStateChange;
OUString m_sLastActivePage;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 99b3b887c7cf..cfee3c0b0d09 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -52,8 +52,8 @@ namespace svxform
{
private:
Link m_aClipboardListener;
- sal_Bool m_bDragging : 1;
- sal_Bool m_bClipboardOwner : 1;
+ bool m_bDragging : 1;
+ bool m_bClipboardOwner : 1;
public:
class GrantAccess
@@ -64,8 +64,8 @@ namespace svxform
public:
OLocalExchange( );
- sal_Bool isDragging() const { return m_bDragging; }
- sal_Bool isClipboardOwner() const { return m_bClipboardOwner; }
+ bool isDragging() const { return m_bDragging; }
+ bool isClipboardOwner() const { return m_bClipboardOwner; }
void startDrag( Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& );
void copyToClipboard( Window* _pWindow, const GrantAccess& );
@@ -74,7 +74,7 @@ namespace svxform
void clear();
- static sal_Bool hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId );
+ static bool hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId );
protected:
// XClipboardOwner
@@ -110,9 +110,9 @@ namespace svxform
void startDrag( sal_Int8 nDragSourceActions );
void copyToClipboard( ) const;
- inline sal_Bool isDragSource() const { return m_pTransferable && m_pTransferable->isDragging(); }
- inline sal_Bool isClipboardOwner() const { return m_pTransferable && m_pTransferable->isClipboardOwner(); }
- inline sal_Bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
+ inline bool isDragSource() const { return m_pTransferable && m_pTransferable->isDragging(); }
+ inline bool isClipboardOwner() const { return m_pTransferable && m_pTransferable->isClipboardOwner(); }
+ inline bool isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
inline void clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); }
SVX_DLLPRIVATE void setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
@@ -220,9 +220,9 @@ namespace svxform
static sal_uInt32 getControlPathFormatId( );
static sal_uInt32 getHiddenControlModelsFormatId( );
- inline static sal_Bool hasFieldExchangeFormat( const DataFlavorExVector& _rFormats );
- inline static sal_Bool hasControlPathFormat( const DataFlavorExVector& _rFormats );
- inline static sal_Bool hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasFieldExchangeFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasControlPathFormat( const DataFlavorExVector& _rFormats );
+ inline static bool hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats );
protected:
virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
@@ -246,17 +246,17 @@ namespace svxform
- inline sal_Bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getFieldExchangeFormatId() );
}
- inline sal_Bool OControlExchange::hasControlPathFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasControlPathFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getControlPathFormatId() );
}
- inline sal_Bool OControlExchange::hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats )
+ inline bool OControlExchange::hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats )
{
return hasFormat( _rFormats, getHiddenControlModelsFormatId() );
}
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 548b7fd6f85c..18b9a187eb23 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -173,7 +173,7 @@ public:
FmEntryData* GetParent() const { return pParent; }
FmEntryDataList* GetChildList() const { return pChildList; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData );
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone() = 0;
// note that the interface returned is normalized, i.e. querying the given XInterface of the object
@@ -223,17 +223,17 @@ typedef std::set<FmEntryData*> FmEntryDataArray;
class FmNavRequestSelectHint : public SfxHint
{
FmEntryDataArray m_arredToSelect;
- sal_Bool m_bMixedSelection;
+ bool m_bMixedSelection;
public:
TYPEINFO_OVERRIDE();
FmNavRequestSelectHint()
- : m_bMixedSelection(sal_False)
+ : m_bMixedSelection(false)
{
}
virtual ~FmNavRequestSelectHint() {}
- void SetMixedSelection(sal_Bool bMixedSelection) { m_bMixedSelection = bMixedSelection; }
- sal_Bool IsMixedSelection() { return m_bMixedSelection; }
+ void SetMixedSelection(bool bMixedSelection) { m_bMixedSelection = bMixedSelection; }
+ bool IsMixedSelection() { return m_bMixedSelection; }
void AddItem(FmEntryData* pEntry) { m_arredToSelect.insert(pEntry); }
void ClearItems() { m_arredToSelect.clear(); }
FmEntryDataArray& GetItems() { return m_arredToSelect; }
@@ -267,7 +267,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const { return m_xForm; }
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& GetContainer() const { return m_xContainer; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
virtual FmEntryData* Clone() SAL_OVERRIDE;
};
@@ -291,7 +291,7 @@ public:
virtual ~FmControlData();
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& GetFormComponent() const { return m_xFormComponent; }
- virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
+ virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) SAL_OVERRIDE;
virtual FmEntryData* Clone() SAL_OVERRIDE;
void ModelReplaced(
@@ -318,7 +318,7 @@ namespace svxform
{
::svxform::NavigatorTreeModel* m_pNavModel;
sal_uInt32 m_nLocks;
- sal_Bool m_bCanUndo;
+ bool m_bCanUndo;
public:
OFormComponentObserver( ::svxform::NavigatorTreeModel* pModel );
@@ -337,8 +337,8 @@ namespace svxform
void Lock() { m_nLocks++; }
void UnLock() { m_nLocks--; }
- sal_Bool IsLocked() const { return m_nLocks != 0; }
- sal_Bool CanUndo() const { return m_bCanUndo; }
+ bool IsLocked() const { return m_nLocks != 0; }
+ bool CanUndo() const { return m_bCanUndo; }
void ReleaseModel() { m_pNavModel = NULL; }
protected:
void Insert(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIface, sal_Int32 nIndex);
@@ -377,7 +377,7 @@ namespace svxform
void BroadcastMarkedObjects(const SdrMarkList& mlMarked);
// einen RequestSelectHint mit den aktuell markierten Objekten broadcasten
- sal_Bool InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject);
+ bool InsertFormComponent(FmNavRequestSelectHint& rHint, SdrObject* pObject);
// ist ein Helper fuer vorherige, managet das Abteigen in SdrObjGroups
// Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht)
@@ -390,19 +390,19 @@ namespace svxform
void UpdateContent( FmFormShell* pNewShell );
void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = CONTAINER_APPEND,
- sal_Bool bAlterModel = sal_False );
- void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
+ bool bAlterModel = false );
+ void Remove( FmEntryData* pEntryData, bool bAlterModel = false );
- sal_Bool Rename( FmEntryData* pEntryData, const OUString& rNewText );
+ bool Rename( FmEntryData* pEntryData, const OUString& rNewText );
void Clear();
- void SetModified( sal_Bool bMod=sal_True );
+ void SetModified( bool bMod=true );
::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > GetForms() const;
FmFormShell* GetFormShell() const { return m_pFormShell; }
FmFormPage* GetFormPage() const { return m_pFormPage; }
- FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True );
- FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True );
+ FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true );
+ FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs=true );
FmEntryDataList* GetRootList() const { return m_pRootList; }
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData );
SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp);
@@ -447,16 +447,16 @@ namespace svxform
unsigned short m_aTimerCounter;
- sal_Bool m_bDragDataDirty : 1; // dito
- sal_Bool m_bPrevSelectionMixed : 1;
- sal_Bool m_bMarkingObjects : 1; // wenn das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
- sal_Bool m_bRootSelected : 1;
- sal_Bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ?
- sal_Bool m_bKeyboardCut : 1;
+ bool m_bDragDataDirty : 1; // dito
+ bool m_bPrevSelectionMixed : 1;
+ bool m_bMarkingObjects : 1; // wenn das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
+ bool m_bRootSelected : 1;
+ bool m_bInitialUpdate : 1; // bin ich das erste Mal im UpdateContent ?
+ bool m_bKeyboardCut : 1;
void UpdateContent();
- FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True );
+ FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, bool bEditName = true );
void NewForm( SvTreeListEntry* pParentEntry );
SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=TREELIST_APPEND );
void Remove( FmEntryData* pEntryData );
@@ -474,7 +474,7 @@ namespace svxform
// SDI_DIRTY ist natuerlich nicht erlaubt als Parameter
// ein einziges Interface fuer alle selektierten Eintraege zusammensetzen
- void ShowSelectionProperties(sal_Bool bForce = sal_False);
+ void ShowSelectionProperties(bool bForce = false);
// alle selektierten Elemnte loeschen
void DeleteSelection();
@@ -485,15 +485,15 @@ namespace svxform
void SynchronizeMarkList();
// umgekehrte Richtung von SynchronizeMarkList : markiert in der ::com::sun::star::sdbcx::View alle der aktuellen Selektion entsprechenden Controls
- void CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
+ void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
// im Select aktualisiere ich normalerweise die Marklist der zugehoerigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
// kann ich das Locking dieses Verhaltens steuern
void LockSelectionHandling() { ++m_nSelectLock; }
void UnlockSelectionHandling() { --m_nSelectLock; }
- sal_Bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; }
+ bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; }
- sal_Bool IsHiddenControl(FmEntryData* pEntryData);
+ bool IsHiddenControl(FmEntryData* pEntryData);
DECL_LINK( OnEdit, void* );
DECL_LINK( OnDropActionTimer, void* );
@@ -516,12 +516,12 @@ namespace svxform
void Clear();
void UpdateContent( FmFormShell* pFormShell );
- void MarkViewObj( FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep = sal_False );
- void MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark );
+ void MarkViewObj( FmFormData* pFormData, bool bMark, bool bDeep = false );
+ void MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark );
void UnmarkAllViewObj();
- sal_Bool IsFormEntry( SvTreeListEntry* pEntry );
- sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry );
+ bool IsFormEntry( SvTreeListEntry* pEntry );
+ bool IsFormComponentEntry( SvTreeListEntry* pEntry );
OUString GenerateName( FmEntryData* pEntryData );
@@ -529,7 +529,7 @@ namespace svxform
SvTreeListEntry* FindEntry( FmEntryData* pEntryData );
virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
- virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+ virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE;
virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
@@ -542,25 +542,25 @@ namespace svxform
using SvTreeListBox::Notify;
private:
- sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD );
- sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD );
+ sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
+ sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
- sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, sal_Bool _bDnD );
- sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD );
+ sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
+ sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
// check if a cut, copy, or drag operation can be started in the current situation
- sal_Bool implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden = NULL );
+ bool implAllowExchange( sal_Int8 _nAction, bool* _pHasNonHidden = NULL );
// check if a paste with the current clipboard content can be accepted
- sal_Bool implAcceptPaste( );
+ bool implAcceptPaste( );
// fills m_aControlExchange in preparation of a DnD or clipboard operation
- sal_Bool implPrepareExchange( sal_Int8 _nAction );
+ bool implPrepareExchange( sal_Int8 _nAction );
void doPaste();
void doCopy();
void doCut();
- sal_Bool doingKeyboardCut( ) const { return m_bKeyboardCut; }
+ bool doingKeyboardCut( ) const { return m_bKeyboardCut; }
};
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 3a5d6b3915d3..dfd4083231b9 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -56,7 +56,7 @@ class SVX_DLLPRIVATE FmFormPageImpl
FmFormPage& m_rPage;
Link m_aFormsCreationHdl;
- sal_Bool m_bFirstActivation;
+ bool m_bFirstActivation;
bool m_bAttemptedFormCreation;
bool m_bInFind;
@@ -88,8 +88,8 @@ public:
);
// activation handling
- inline sal_Bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
+ inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true );
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index bb2623e3d938..053dd2043939 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -226,21 +226,21 @@ class FmXFormShell :public FmXFormShell_BASE
mutable ::svxform::DocumentType
m_eDocumentType; /// the type of document we're living in
sal_Int16 m_nLockSlotInvalidation;
- sal_Bool m_bHadPropertyBrowserInDesignMode : 1;
+ bool m_bHadPropertyBrowserInDesignMode : 1;
- sal_Bool m_bTrackProperties : 1;
+ bool m_bTrackProperties : 1;
// soll ich (bzw. der Owner diese Impl-Klasse) mich um die Aktualisierung des ::com::sun::star::beans::Property-Browsers kuemmern ?
- sal_Bool m_bUseWizards : 1;
+ bool m_bUseWizards : 1;
- sal_Bool m_bDatabaseBar : 1; // Gibt es eine Datenbankleiste
- sal_Bool m_bInActivate : 1; // Wird ein Controller aktiviert
- sal_Bool m_bSetFocus : 1; // Darf der Focus umgesetzt werden
- sal_Bool m_bFilterMode : 1; // Wird gerade ein Filter auf die Controls angesetzt
- sal_Bool m_bChangingDesignMode:1; // sal_True within SetDesignMode
- sal_Bool m_bPreparedClose : 1; // for the current modification state of the current form
+ bool m_bDatabaseBar : 1; // Gibt es eine Datenbankleiste
+ bool m_bInActivate : 1; // Wird ein Controller aktiviert
+ bool m_bSetFocus : 1; // Darf der Focus umgesetzt werden
+ bool m_bFilterMode : 1; // Wird gerade ein Filter auf die Controls angesetzt
+ bool m_bChangingDesignMode:1; // sal_True within SetDesignMode
+ bool m_bPreparedClose : 1; // for the current modification state of the current form
// PrepareClose had been called and the user denied to save changes
- sal_Bool m_bFirstActivation : 1; // has the shell ever been activated?
+ bool m_bFirstActivation : 1; // has the shell ever been activated?
public:
// attribute access
@@ -249,10 +249,10 @@ public:
inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >&
getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }
- inline sal_Bool
+ inline bool
didPrepareClose() const { return m_bPreparedClose; }
inline void
- didPrepareClose( sal_Bool _bDid ) { m_bPreparedClose = _bDid; }
+ didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }
public:
FmXFormShell(FmFormShell& _rShell, SfxViewFrame* _pViewFrame);
@@ -290,12 +290,12 @@ protected:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
public:
- void EnableTrackProperties( sal_Bool bEnable) { m_bTrackProperties = bEnable; }
- sal_Bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
+ void EnableTrackProperties( bool bEnable) { m_bTrackProperties = bEnable; }
+ bool IsTrackPropertiesEnabled() {return m_bTrackProperties;}
// activation handling
- void viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction = sal_False );
- void viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController = sal_True );
+ void viewActivated( FmFormView& _rCurrentView, bool _bSyncAction = false );
+ void viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivateController = true );
// IControllerFeatureInvalidation
virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) SAL_OVERRIDE;
@@ -311,18 +311,18 @@ public:
/** updates m_xForms, to be either <NULL/>, if we're in alive mode, or our current page's forms collection,
if in design mode
*/
- void UpdateForms( sal_Bool _bInvalidate );
+ void UpdateForms( bool _bInvalidate );
void ExecuteSearch(); // execute SID_FM_SEARCH
void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
- sal_Bool GetY2KState(sal_uInt16& n);
+ bool GetY2KState(sal_uInt16& n);
void SetY2KState(sal_uInt16 n);
protected:
// activation handling
- inline sal_Bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- inline void setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
+ inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
+ inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
// form handling
/// load or unload the forms on a page
@@ -353,7 +353,7 @@ protected:
public:
// methode fuer nicht designmode (alive mode)
- void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False );
+ void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false );
const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;}
@@ -389,7 +389,7 @@ public:
getCurrentForm() const { return m_xCurrentForm; }
void forgetCurrentForm();
/// returns whether the last known marking contained only controls
- sal_Bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
+ bool onlyControlsAreMarked() const { return !m_aLastKnownMarkedControls.empty(); }
/// determines whether the current selection consists of exactly the given object
bool isSolelySelected(
@@ -401,12 +401,12 @@ public:
/// handles the request for showing the "Properties"
void handleShowPropertiesRequest();
- sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
- sal_Bool hasDatabaseBar() const {return m_bDatabaseBar;}
- sal_Bool canNavigate() const {return m_xNavigationController.is();}
+ bool hasForms() const {return m_xForms.is() && m_xForms->getCount() != 0;}
+ bool hasDatabaseBar() const {return m_bDatabaseBar;}
+ bool canNavigate() const {return m_xNavigationController.is();}
- void ShowSelectionProperties( sal_Bool bShow );
- sal_Bool IsPropBrwOpen() const;
+ void ShowSelectionProperties( bool bShow );
+ bool IsPropBrwOpen() const;
void DetermineSelection(const SdrMarkList& rMarkList);
void SetSelection(const SdrMarkList& rMarkList);
@@ -414,13 +414,13 @@ public:
void SetDesignMode(bool bDesign);
- sal_Bool GetWizardUsing() const { return m_bUseWizards; }
- void SetWizardUsing(sal_Bool _bUseThem);
+ bool GetWizardUsing() const { return m_bUseWizards; }
+ void SetWizardUsing(bool _bUseThem);
// Setzen des Filtermodus
- sal_Bool isInFilterMode() const {return m_bFilterMode;}
+ bool isInFilterMode() const {return m_bFilterMode;}
void startFiltering();
- void stopFiltering(sal_Bool bSave);
+ void stopFiltering(bool bSave);
static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
@@ -454,8 +454,8 @@ public:
// das Setzen des curObject/selObject/curForm erfolgt verzoegert (SetSelectionDelayed), mit den folgenden
// Funktionen laesst sich das abfragen/erzwingen
- inline sal_Bool IsSelectionUpdatePending();
- void ForceUpdateSelection(sal_Bool bLockInvalidation);
+ inline bool IsSelectionUpdatePending();
+ void ForceUpdateSelection(bool bLockInvalidation);
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getContextDocument() const;
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& _xForm) const;
@@ -477,11 +477,11 @@ private:
void LoopGrids(sal_Int16 nWhat);
// Invalidierung von Slots
- void InvalidateSlot( sal_Int16 nId, sal_Bool bWithId );
+ void InvalidateSlot( sal_Int16 nId, bool bWithId );
void UpdateSlot( sal_Int16 nId );
// Locking der Invalidierung - wenn der interne Locking-Counter auf 0 geht, werden alle aufgelaufenen Slots
// (asynchron) invalidiert
- void LockSlotInvalidation(sal_Bool bLock);
+ void LockSlotInvalidation(bool bLock);
DECL_LINK(OnInvalidateSlots, void*);
@@ -537,7 +537,7 @@ protected:
};
-inline sal_Bool FmXFormShell::IsSelectionUpdatePending()
+inline bool FmXFormShell::IsSelectionUpdatePending()
{
return m_aMarkTimer.IsActive();
}
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 785d122050c0..abaf346ab908 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -157,7 +157,7 @@ public:
void Lock() { osl_atomic_increment( &m_Locks ); }
void UnLock() { osl_atomic_decrement( &m_Locks ); }
- sal_Bool IsLocked() const { return m_Locks != 0; }
+ bool IsLocked() const { return m_Locks != 0; }
// access control
struct Accessor { friend class FmFormModel; private: Accessor() { } };
@@ -167,8 +167,8 @@ public:
void RemoveForms( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms );
// readonly-ness
- void SetReadOnly( sal_Bool bRead, const Accessor& ) { bReadOnly = bRead; }
- sal_Bool IsReadOnly() const {return bReadOnly;}
+ void SetReadOnly( bool bRead, const Accessor& ) { bReadOnly = bRead; }
+ bool IsReadOnly() const {return bReadOnly;}
protected:
// XEventListener
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 824ac2c2122c..a9ce1ba04cda 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -187,7 +187,7 @@ protected:
FmXFormView( FmFormView* _pView );
virtual ~FmXFormView();
- void saveMarkList( sal_Bool _bSmartUnmark = sal_True );
+ void saveMarkList( bool _bSmartUnmark = true );
void restoreMarkList( SdrMarkList& _rRestoredMarkList );
void stopMarkListWatching();
void startMarkListWatching();
@@ -248,8 +248,8 @@ private:
//void addWindow(const SdrPageViewWinRec*);
void addWindow(const SdrPageWindow&);
void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
- void Activate(sal_Bool bSync = sal_False);
- void Deactivate(sal_Bool bDeactivateController = sal_True);
+ void Activate(bool bSync = false);
+ void Deactivate(bool bDeactivateController = true);
SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -296,7 +296,7 @@ private:
void cancelEvents();
/// the auto focus to the first (in terms of the tab order) control
- void AutoFocus( sal_Bool _bSync = sal_False );
+ void AutoFocus( bool _bSync = false );
DECL_LINK( OnActivate, void* );
DECL_LINK( OnAutoFocus, void* );
DECL_LINK( OnDelayedErrorMessage, void* );
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index a12b5b6f283e..0134eadc2243 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -82,9 +82,9 @@
#include <comphelper/implbase_var.hxx>
#endif
-struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
+struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , bool>
{
- sal_Bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
+ bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
{
return reinterpret_cast<sal_Int64>(x.get()) < reinterpret_cast<sal_Int64>(y.get());
}
@@ -190,19 +190,19 @@ namespace svxform
sal_Int32 m_nCurrentFilterPosition; // current level for filtering (or-criteria)
- sal_Bool m_bCurrentRecordModified : 1;
- sal_Bool m_bCurrentRecordNew : 1;
- sal_Bool m_bLocked : 1;
- sal_Bool m_bDBConnection : 1; // Focuslistener nur fuer Datenbankformulare
- sal_Bool m_bCycle : 1;
- sal_Bool m_bCanInsert : 1;
- sal_Bool m_bCanUpdate : 1;
- sal_Bool m_bCommitLock : 1; // lock the committing of controls see focusGained
- sal_Bool m_bModified : 1; // ist der Inhalt eines Controls modifiziert ?
- sal_Bool m_bControlsSorted : 1;
- sal_Bool m_bFiltering : 1;
- sal_Bool m_bAttachEvents : 1;
- sal_Bool m_bDetachEvents : 1;
+ bool m_bCurrentRecordModified : 1;
+ bool m_bCurrentRecordNew : 1;
+ bool m_bLocked : 1;
+ bool m_bDBConnection : 1; // Focuslistener nur fuer Datenbankformulare
+ bool m_bCycle : 1;
+ bool m_bCanInsert : 1;
+ bool m_bCanUpdate : 1;
+ bool m_bCommitLock : 1; // lock the committing of controls see focusGained
+ bool m_bModified : 1; // ist der Inhalt eines Controls modifiziert ?
+ bool m_bControlsSorted : 1;
+ bool m_bFiltering : 1;
+ bool m_bAttachEvents : 1;
+ bool m_bDetachEvents : 1;
bool m_bAttemptedHandlerCreation : 1;
bool m_bSuspendFilterTextListening; // no bit field, passed around as reference
@@ -480,14 +480,14 @@ namespace svxform
void setControlLock(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
- void toggleAutoFields(sal_Bool bAutoFields);
+ void toggleAutoFields(bool bAutoFields);
void unload() throw( ::com::sun::star::uno::RuntimeException );
void removeBoundFieldListener();
- void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
- void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
+ void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly );
+ void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, sal_Bool _bRemove, sal_Bool _bOverWrite ) const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, bool _bRemove, bool _bOverWrite ) const;
void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
@@ -522,8 +522,8 @@ namespace svxform
*/
void impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify );
- sal_Bool isLocked() const {return m_bLocked;}
- sal_Bool determineLockState() const;
+ bool isLocked() const {return m_bLocked;}
+ bool determineLockState() const;
Window* getDialogParentWindow();
// returns the window which should be used as parent window for dialogs
@@ -565,7 +565,7 @@ namespace svxform
void impl_setTextOnAllFilter_throw();
// in filter mode we do not listen for changes
- sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
+ bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const;
DECL_LINK( OnActivateTabOrder, void* );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index e1cedf04d14d..dbe66831e329 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -175,13 +175,13 @@ namespace svx
sal_Int32 _nSlotId,
::com::sun::star::form::runtime::FeatureState& _out_rState
) const;
- sal_Bool isEnabled( sal_Int32 _nSlotId ) const;
+ bool isEnabled( sal_Int32 _nSlotId ) const;
void execute( sal_Int32 _nSlotId ) const;
void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const;
- sal_Bool commitCurrentRecord() const;
- sal_Bool commitCurrentControl( ) const;
- sal_Bool isInsertionRow() const;
- sal_Bool isModifiedRow() const;
+ bool commitCurrentRecord() const;
+ bool commitCurrentControl( ) const;
+ bool isInsertionRow() const;
+ bool isModifiedRow() const;
bool canDoFormFilter() const;
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index 92766a3558cd..1c2cf672b75d 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -63,7 +63,7 @@ namespace svxform
// the component which's dispatches we're intercepting
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception >
m_xIntercepted;
- sal_Bool m_bListening;
+ bool m_bListening;
// the real interceptor
DispatchInterceptor* m_pMaster;
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index b2d6062da04f..f2d138fb752f 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -48,8 +48,8 @@ namespace svx
const ::com::sun::star::util::URL m_aFeatureURL;
::com::sun::star::uno::Any m_aLastKnownState;
const sal_Int16 m_nFormFeature;
- sal_Bool m_bLastKnownEnabled;
- sal_Bool m_bDisposed;
+ bool m_bLastKnownEnabled;
+ bool m_bDisposed;
public:
/** constructs the dispatcher
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 1778dc6f7472..6275c3f8ee80 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -85,14 +85,14 @@ private:
sal_uInt16 m_nId;
sal_Int16 m_nFieldPos;
sal_Int16 m_nAlign; // wird mit TXT_ALIGN_LEFT .... angegeben
- sal_Bool m_bReadOnly : 1;
- sal_Bool m_bAutoValue : 1;
- sal_Bool m_bInSave : 1;
- sal_Bool m_bNumeric : 1;
- sal_Bool m_bObject : 1; // Verweist die Column auf ein Object Datentyp?
- sal_Bool m_bHidden : 1;
- sal_Bool m_bLocked : 1;
- sal_Bool m_bDateTime : 1;
+ bool m_bReadOnly : 1;
+ bool m_bAutoValue : 1;
+ bool m_bInSave : 1;
+ bool m_bNumeric : 1;
+ bool m_bObject : 1; // Verweist die Column auf ein Object Datentyp?
+ bool m_bHidden : 1;
+ bool m_bLocked : 1;
+ bool m_bDateTime : 1;
static ::svt::CellControllerRef s_xEmptyController;
// used by locked columns
@@ -107,14 +107,14 @@ public:
,m_nId(_nId)
,m_nFieldPos(-1)
,m_nAlign(::com::sun::star::awt::TextAlign::LEFT)
- ,m_bReadOnly(sal_False)
- ,m_bAutoValue(sal_False)
- ,m_bInSave(sal_False)
- ,m_bNumeric(sal_False)
- ,m_bObject(sal_False)
- ,m_bHidden(sal_False)
- ,m_bLocked(sal_False)
- ,m_bDateTime(sal_False)
+ ,m_bReadOnly(false)
+ ,m_bAutoValue(false)
+ ,m_bInSave(false)
+ ,m_bNumeric(false)
+ ,m_bObject(false)
+ ,m_bHidden(false)
+ ,m_bLocked(false)
+ ,m_bDateTime(false)
{
}
@@ -125,16 +125,16 @@ public:
sal_uInt16 GetId() const {return m_nId;}
- sal_Bool IsReadOnly() const {return m_bReadOnly;}
- sal_Bool IsAutoValue() const {return m_bAutoValue;}
- sal_Bool IsUpdating() const {return m_bInSave;}
+ bool IsReadOnly() const {return m_bReadOnly;}
+ bool IsAutoValue() const {return m_bAutoValue;}
+ bool IsUpdating() const {return m_bInSave;}
sal_Int16 GetAlignment() const {return m_nAlign;}
sal_Int16 GetType() const {return m_nFieldType;}
sal_Int16 GetFieldPos() const {return m_nFieldPos; }
- sal_Bool IsNumeric() const {return m_bNumeric;}
- sal_Bool IsDateTime() const {return m_bDateTime;}
- sal_Bool IsObject() const {return m_bObject;}
- sal_Bool IsHidden() const {return m_bHidden;}
+ bool IsNumeric() const {return m_bNumeric;}
+ bool IsDateTime() const {return m_bDateTime;}
+ bool IsObject() const {return m_bObject;}
+ bool IsHidden() const {return m_bHidden;}
sal_Int32 GetKey() const {return m_nFormatKey;}
const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;}
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& GetField() const {return m_xField;}
@@ -163,7 +163,7 @@ public:
// Editieren einer Zelle
void UpdateFromField(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter);
- sal_Bool Commit();
+ bool Commit();
// freigeben aller Daten, die fuer den AliveMode noetig sind
void Clear();
@@ -171,8 +171,8 @@ public:
OUString GetCellText(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const;
OUString GetCellText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const;
- void SetReadOnly(sal_Bool bRead){m_bReadOnly = bRead;}
- void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = sal_True; m_nFieldPos = nPos;}
+ void SetReadOnly(bool bRead){m_bReadOnly = bRead;}
+ void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;}
void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat );
@@ -185,8 +185,8 @@ public:
// alignment if the property if void, return the really set alignment
// column locking
- sal_Bool isLocked() const { return m_bLocked; }
- void setLock(sal_Bool _bLock);
+ bool isLocked() const { return m_bLocked; }
+ void setLock(bool _bLock);
private:
/** attaches or detaches our cell object to the SctriptEventAttacherManager implemented
@@ -211,9 +211,9 @@ private:
::comphelper::OPropertyChangeMultiplexer* m_pFieldChangeBroadcaster;
private:
- sal_Bool m_bTransparent : 1;
- sal_Bool m_bAlignedController : 1;
- sal_Bool m_bAccessingValueProperty : 1;
+ bool m_bTransparent : 1;
+ bool m_bAlignedController : 1;
+ bool m_bAccessingValueProperty : 1;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >
m_xCursor;
@@ -228,17 +228,17 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& getCursor() const { return m_xCursor; }
// control transparency
- inline sal_Bool isTransparent( ) const { return m_bTransparent; }
- inline void setTransparent( sal_Bool _bSet ) { m_bTransparent = _bSet; }
+ inline bool isTransparent( ) const { return m_bTransparent; }
+ inline void setTransparent( bool _bSet ) { m_bTransparent = _bSet; }
// control alignment
- inline void setAlignedController( sal_Bool _bAlign = sal_True ) { m_bAlignedController = _bAlign; }
+ inline void setAlignedController( bool _bAlign = true ) { m_bAlignedController = _bAlign; }
/** determined whether or not the value property is locked
@see lockValueProperty
*/
- inline sal_Bool isValuePropertyLocked() const;
+ inline bool isValuePropertyLocked() const;
/** locks the listening at the value property.
<p>This means that every subsequent change now done on the value property of the model ("Text", or "Value",
@@ -269,7 +269,7 @@ protected:
public:
TYPEINFO();
- DbCellControl(DbGridColumn& _rColumn, sal_Bool _bText = sal_True);
+ DbCellControl(DbGridColumn& _rColumn, bool _bText = true);
virtual ~DbCellControl();
@@ -280,7 +280,7 @@ public:
}
// control alignment
- inline sal_Bool isAlignedController() const { return m_bAlignedController; }
+ inline bool isAlignedController() const { return m_bAlignedController; }
void AlignControl(sal_Int16 nAlignment);
void SetTextLineColor();
@@ -291,7 +291,7 @@ public:
virtual ::svt::CellControllerRef CreateController() const = 0;
// Schreiben des Wertes in das Model
- sal_Bool Commit();
+ bool Commit();
// Formatting the field data to output text
virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0;
@@ -316,7 +316,7 @@ protected:
<p>To be overwritten in derived classes.</p>
@see updateFromModel
*/
- virtual sal_Bool commitControl( ) = 0;
+ virtual bool commitControl( ) = 0;
/** updates the current content of the control (e.g. the text of an edit field) from the column model
(e.g. the "Text" property of the model).
@@ -335,7 +335,7 @@ protected:
virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
private:
- void implDoPropertyListening( const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent = sal_True );
+ void implDoPropertyListening( const OUString& _rPropertyName, bool _bWarnIfNotExistent = true );
/// updates the "readonly" setting on m_pWindow, according to the respective property value in the given model
void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,bool i_bReadOnly );
@@ -346,7 +346,7 @@ private:
-inline sal_Bool DbCellControl::isValuePropertyLocked() const
+inline bool DbCellControl::isValuePropertyLocked() const
{
return m_bAccessingValueProperty;
}
@@ -355,14 +355,14 @@ inline sal_Bool DbCellControl::isValuePropertyLocked() const
inline void DbCellControl::lockValueProperty()
{
OSL_ENSURE( !isValuePropertyLocked(), "DbCellControl::lockValueProperty: not to be nested!" );
- m_bAccessingValueProperty = sal_True;
+ m_bAccessingValueProperty = true;
}
inline void DbCellControl::unlockValueProperty()
{
OSL_ENSURE( isValuePropertyLocked(), "DbCellControl::lockValueProperty: not locked so far!" );
- m_bAccessingValueProperty = sal_False;
+ m_bAccessingValueProperty = false;
}
@@ -394,7 +394,7 @@ class DbTextField : public DbLimitedLengthField
::svt::IEditImplementation* m_pEdit;
::svt::IEditImplementation* m_pPainterImplementation;
sal_Int16 m_nKeyType;
- sal_Bool m_bIsSimpleEdit;
+ bool m_bIsSimpleEdit;
protected:
virtual ~DbTextField( );
@@ -404,7 +404,7 @@ public:
DbTextField(DbGridColumn& _rColumn);
::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; }
- sal_Bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
+ bool IsSimpleEdit() const { return m_bIsSimpleEdit; }
virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE;
virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE;
@@ -416,7 +416,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbLimitedLengthField
virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) SAL_OVERRIDE;
@@ -443,7 +443,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// OPropertyChangeListener
@@ -467,7 +467,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
};
@@ -489,7 +489,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -501,7 +501,7 @@ protected:
class DbListBox :public DbCellControl
{
- sal_Bool m_bBound : 1;
+ bool m_bBound : 1;
::com::sun::star::uno::Sequence< OUString > m_aValueList;
public:
@@ -517,7 +517,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -539,7 +539,7 @@ public:
protected:
/// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE;
@@ -590,7 +590,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -615,7 +615,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -644,7 +644,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -669,7 +669,7 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
// DbSpinField
@@ -692,9 +692,9 @@ class DbFilterField
OUString m_aText;
Link m_aCommitLink;
sal_Int16 m_nControlClass;
- sal_Bool m_bFilterList : 1;
- sal_Bool m_bFilterListFilled : 1;
- sal_Bool m_bBound : 1;
+ bool m_bFilterList : 1;
+ bool m_bFilterListFilled : 1;
+ bool m_bBound : 1;
public:
TYPEINFO_OVERRIDE();
@@ -717,11 +717,11 @@ public:
protected:
// DbCellControl
- virtual sal_Bool commitControl( ) SAL_OVERRIDE;
+ virtual bool commitControl( ) SAL_OVERRIDE;
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) SAL_OVERRIDE;
protected:
- void SetList(const ::com::sun::star::uno::Any& rItems, sal_Bool bComboBox);
+ void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox);
void CreateControl(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel);
DECL_LINK( OnClick, void* );
};
@@ -812,11 +812,11 @@ public:
virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool Commit() {return m_pCellControl->Commit();}
+ bool Commit() {return m_pCellControl->Commit();}
void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat )
{ m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); }
- sal_Bool isAlignedController() const { return m_pCellControl->isAlignedController(); }
+ bool isAlignedController() const { return m_pCellControl->isAlignedController(); }
void AlignControl(sal_Int16 nAlignment)
{ m_pCellControl->AlignControl(nAlignment);}
@@ -872,7 +872,7 @@ protected:
This member is <TRUE/> by default, and can be modified by derived classes.
*/
- sal_Bool m_bFastPaint;
+ bool m_bFastPaint;
public:
TYPEINFO_OVERRIDE();
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index e85091caa5d4..02cea4f5e026 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -48,9 +48,9 @@ namespace svxform
// (which is checked via the supported interfaces) _all_ members will be set to
// void !, even if the object has some of the needed interfaces.
- sal_Bool is() const { return m_xColumn.is(); }
- sal_Bool Is() const { return m_xColumn.is(); }
- sal_Bool supportsUpdate() const { return m_xColumnUpdate.is(); }
+ bool is() const { return m_xColumn.is(); }
+ bool Is() const { return m_xColumn.is(); }
+ bool supportsUpdate() const { return m_xColumnUpdate.is(); }
DataColumn* operator ->() { return this; }
operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); }
@@ -84,9 +84,9 @@ namespace svxform
inline void removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::sdb::XColumn
- inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
- inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline sal_Int32 getInt() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
@@ -107,7 +107,7 @@ namespace svxform
// XColumnUpdate
inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
- inline void updateBoolean(sal_Bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
+ inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
inline void updateInt(sal_Int32 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index c7043bb48dcd..7b08ee51c9a2 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -70,7 +70,7 @@ class SvxPixelCtlAccessibleChild :
SvxPixelCtl& mrParentWindow;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
void IsValid() throw (::com::sun::star::uno::RuntimeException);
- sal_Bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
+ bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
Point maPoint;
Rectangle* mpBoundingBox;
/// index of child in parent
@@ -80,7 +80,7 @@ class SvxPixelCtlAccessibleChild :
public:
SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
- sal_Bool bPixelColorOrBG,
+ bool bPixelColorOrBG,
const Point& aPoint,
const Rectangle& rBounds,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent,
@@ -142,16 +142,16 @@ public:
virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
/// @returns true if it's disposed or in disposing
- inline sal_Bool IsAlive( void ) const;
+ inline bool IsAlive( void ) const;
/// @returns true if it's not disposed and no in disposing
- inline sal_Bool IsNotAlive( void ) const;
+ inline bool IsNotAlive( void ) const;
/// throws the exception DisposedException if it's not alive
void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException );
void CheckChild();
- void SelectChild( sal_Bool bSelect);
- void ChangePixelColorOrBG(sal_Bool bPixelColorOrBG){ m_bPixelColorOrBG = bPixelColorOrBG ;}
+ void SelectChild( bool bSelect);
+ void ChangePixelColorOrBG(bool bPixelColorOrBG){ m_bPixelColorOrBG = bPixelColorOrBG ;}
OUString GetName();
};
@@ -244,32 +244,32 @@ public:
void LoseFocus();
/// @returns true if it's disposed or in disposing
- inline sal_Bool IsAlive( void ) const;
+ inline bool IsAlive( void ) const;
/// @returns true if it's not disposed and no in disposing
- inline sal_Bool IsNotAlive( void ) const;
+ inline bool IsNotAlive( void ) const;
protected:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild;
public:
- void NotifyChild(long nIndex,sal_Bool bSelect ,sal_Bool bCheck);
+ void NotifyChild(long nIndex, bool bSelect, bool bCheck);
};
-inline sal_Bool SvxPixelCtlAccessible::IsAlive( void ) const
+inline bool SvxPixelCtlAccessible::IsAlive( void ) const
{
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessible::IsNotAlive( void ) const
+inline bool SvxPixelCtlAccessible::IsNotAlive( void ) const
{
return rBHelper.bDisposed || rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessibleChild::IsAlive( void ) const
+inline bool SvxPixelCtlAccessibleChild::IsAlive( void ) const
{
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline sal_Bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const
+inline bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const
{
return rBHelper.bDisposed || rBHelper.bInDispose;
}
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 489441bddd30..cae837f125a4 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -106,13 +106,13 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL
@@ -241,7 +241,7 @@ protected:
@param nIndexOfChild
Index of the new child which should be selected.
*/
- void selectChild( long nIndexOfChild, sal_Bool bFireFocus = sal_True);
+ void selectChild( long nIndexOfChild, bool bFireFocus = true);
public:
/** Selects a new child by point.
@@ -252,7 +252,7 @@ public:
@param eButton
Button which belongs to the child which should be selected.
*/
- void selectChild( RECT_POINT ePoint, sal_Bool bFireFocus = sal_True );
+ void selectChild( RECT_POINT ePoint, bool bFireFocus = true );
void FireChildFocus( RECT_POINT eButton );
protected:
@@ -364,13 +364,13 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL
getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isShowing() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isVisible() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL
+ virtual bool SAL_CALL
isFocusTraversable() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 3976f8c5314f..3e49fee12807 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -106,7 +106,7 @@ public:
const OUString& GetObjectName() const { return m_aObjectName; }
sal_Int32 GetObjectType() const { return m_nObjectType; }
- sal_Bool createSelectionControls( );
+ bool createSelectionControls( );
protected:
// FmXChangeListener
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index d31dad59fdef..3ef6205f23bd 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -68,7 +68,7 @@ protected:
private:
Gallery* mpGallery;
- sal_Bool mbHiddenThemes;
+ bool mbHiddenThemes;
};
}
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index ba5ac224fb2a..cbceee89cd80 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -137,7 +137,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const
SvxNumberInfoItem& rOther = (SvxNumberInfoItem&)rItem;
- sal_Bool bEqual = sal_False;
+ bool bEqual = false;
if ( nDelCount == rOther.nDelCount )
{
@@ -145,7 +145,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const
{
if ( pDelFormatArr != NULL && rOther.pDelFormatArr != NULL )
{
- bEqual = sal_True;
+ bEqual = true;
for ( sal_uInt16 i = 0; i < nDelCount && bEqual; ++i )
bEqual = ( pDelFormatArr[i] == rOther.pDelFormatArr[i] );
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 6adc0541fba1..3539ff1cc6f7 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -239,14 +239,14 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
{
sal_uInt8 eType;
- sal_Bool bLand;
+ bool bLand;
sal_uInt16 nUse;
// UNICODE: rStream >> sStr;
OUString sStr = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
rStream.ReadUChar( eType );
- rStream.ReadUChar( bLand );
+ rStream.ReadCharAsBool( bLand );
rStream.ReadUInt16( nUse );
SvxPageItem* pPage = new SvxPageItem( Which() );
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index c75be5c8c22d..9ad73c117caa 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -102,13 +102,13 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM
aSeq[0].Name = OUString( VIEWLAYOUT_PARAM_COLUMNS );
aSeq[0].Value <<= sal_Int32( GetValue() );
aSeq[1].Name = OUString( VIEWLAYOUT_PARAM_BOOKMODE );
- aSeq[1].Value <<= sal_Bool( mbBookMode );
+ aSeq[1].Value <<= mbBookMode;
rVal <<= aSeq;
}
break;
case MID_VIEWLAYOUT_COLUMNS : rVal <<= (sal_Int32) GetValue(); break;
- case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break;
+ case MID_VIEWLAYOUT_BOOKMODE: rVal <<= mbBookMode; break;
default:
OSL_FAIL("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!");
return false;
@@ -128,7 +128,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
if (( rVal >>= aSeq ) && ( aSeq.getLength() == VIEWLAYOUT_PARAMS ))
{
sal_Int32 nColumns( 0 );
- sal_Bool bBookMode = sal_False;
+ bool bBookMode = false;
bool bAllConverted( true );
sal_Int16 nConvertedCount( 0 );
for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
@@ -170,7 +170,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
case MID_VIEWLAYOUT_BOOKMODE:
{
- sal_Bool bBookMode = sal_False;
+ bool bBookMode = false;
if ( rVal >>= bBookMode )
{
mbBookMode = bBookMode;
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 688e5c5c589c..567e4f20811b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -57,7 +57,7 @@ namespace sdr
if(nSubHierarchyCount)
{
- const sal_Bool bDoGhostedDisplaying(
+ const bool bDoGhostedDisplaying(
GetObjectContact().DoVisualizeEnteredGroup()
&& !GetObjectContact().isOutputToPrinter()
&& GetObjectContact().getActiveViewContact() == &GetViewContact());
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index d336a7dd734b..b3926af144d1 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -676,7 +676,7 @@ namespace sdr
if(nSubHierarchyCount)
{
- const sal_Bool bDoGhostedDisplaying(
+ const bool bDoGhostedDisplaying(
GetObjectContact().DoVisualizeEnteredGroup()
&& !GetObjectContact().isOutputToPrinter()
&& GetObjectContact().getActiveViewContact() == &GetViewContact());
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 87df67803e93..b163ab5054cd 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -319,7 +319,7 @@ namespace sdr
// If metric has changed, scale items.
MapUnit aOldUnit(pOldModel->GetScaleUnit());
MapUnit aNewUnit(pNewModel->GetScaleUnit());
- sal_Bool bScaleUnitChanged(aNewUnit != aOldUnit);
+ bool bScaleUnitChanged(aNewUnit != aOldUnit);
Fraction aMetricFactor;
if(bScaleUnitChanged)
@@ -522,7 +522,7 @@ namespace sdr
void AttributeProperties::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
- sal_Bool bHintUsed(sal_False);
+ bool bHintUsed(false);
SfxStyleSheetHint *pStyleHint = PTR_CAST(SfxStyleSheetHint, &rHint);
@@ -598,7 +598,7 @@ namespace sdr
rObj.SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect);
- bHintUsed = sal_True;
+ bHintUsed = true;
}
if(!bHintUsed)
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 487c8f10bab5..72577da11069 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -87,11 +87,11 @@ namespace sdr
bool CustomShapeProperties::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem ) const
{
- sal_Bool bAllowItemChange = sal_True;
+ bool bAllowItemChange = true;
if ( !pNewItem )
{
if ( ( nWhich >= SDRATTR_CUSTOMSHAPE_FIRST ) && ( nWhich <= SDRATTR_CUSTOMSHAPE_LAST ) )
- bAllowItemChange = sal_False;
+ bAllowItemChange = false;
}
if ( bAllowItemChange )
bAllowItemChange = TextProperties::AllowItemChange( nWhich, pNewItem );
@@ -211,7 +211,7 @@ namespace sdr
{
TextProperties::Notify( rBC, rHint );
- sal_Bool bRemoveRenderGeometry = sal_False;
+ bool bRemoveRenderGeometry = false;
const SfxStyleSheetHint *pStyleHint = PTR_CAST( SfxStyleSheetHint, &rHint );
const SfxSimpleHint *pSimpleHint = PTR_CAST( SfxSimpleHint, &rHint );
@@ -221,13 +221,13 @@ namespace sdr
{
case SFX_STYLESHEET_MODIFIED :
case SFX_STYLESHEET_CHANGED :
- bRemoveRenderGeometry = sal_True;
+ bRemoveRenderGeometry = true;
break;
};
}
else if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DATACHANGED )
{
- bRemoveRenderGeometry = sal_True;
+ bRemoveRenderGeometry = true;
}
// update bTextFrame and RenderGeometry
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 4eb2bafce908..e8c3dc27735f 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -144,7 +144,7 @@ namespace sdr
sal_uInt16 nWhich(aWhichIter.FirstWhich());
const SfxPoolItem *pPoolItem;
std::vector< sal_uInt16 > aPostItemChangeList;
- sal_Bool bDidChange(sal_False);
+ bool bDidChange(false);
SfxItemSet aSet(*GetSdrObject().GetObjectItemPool(), SDRATTR_START, EE_ITEMS_END);
// give a hint to STL_Vector
@@ -156,7 +156,7 @@ namespace sdr
{
if(AllowItemChange(nWhich, pPoolItem))
{
- bDidChange = sal_True;
+ bDidChange = true;
ItemChange(nWhich, pPoolItem);
aPostItemChangeList.push_back( nWhich );
aSet.Put(*pPoolItem);
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 59c92918ef41..71cb2f97085d 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -162,7 +162,7 @@ namespace sdr
if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich))
{
- sal_Bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue());
+ bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue());
rObj.SetVerticalWriting(bVertical);
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 5f9e4e2a936d..7452532c0877 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -1071,7 +1071,7 @@ void LinePropertyPanel::SelectLineStyle()
void LinePropertyPanel::SelectEndStyle(bool bStart)
{
- sal_Bool bSelected(false);
+ bool bSelected(false);
if(bStart)
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 6b1a9b869fd2..16910832fc4b 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -64,7 +64,7 @@ namespace svx { namespace sidebar {
Font& lcl_GetDefaultBulletFont()
{
- static sal_Bool bInit = 0;
+ static bool bInit = false;
static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
if(!bInit)
{
@@ -73,7 +73,7 @@ Font& lcl_GetDefaultBulletFont()
aDefBulletFont.SetPitch( PITCH_DONTKNOW );
aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
aDefBulletFont.SetTransparent( true );
- bInit = sal_True;
+ bInit = true;
}
return aDefBulletFont;
}
@@ -636,7 +636,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI
for (sal_uInt16 i=0; i < aGrfDataLst.size(); ++i)
{
GrfBulDataRelation* pEntry = aGrfDataLst[i];
- sal_Bool bExist = sal_False;
+ bool bExist = false;
if ( pEntry)
bExist = GalleryExplorer::GetGraphicObj(GALLERY_THEME_BULLETS, pEntry->nGallaryIndex,&aGraphic);
if (bExist) {
@@ -1625,7 +1625,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
sal_uInt16 nLength = sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*);
for(sal_uInt16 iDex = nFromIndex; iDex < nLength; iDex++)
{
- sal_Bool bNotMatch = sal_False;
+ bool bNotMatch = false;
OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[iDex];
sal_uInt16 nCount = pItemArr->pNumSettingsArr->size();
for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++)
@@ -1650,13 +1650,13 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
_pSet->nNumAlignAt == aFmt.GetFirstLineIndent() &&
_pSet->nNumIndentAt == aFmt.GetIndentAt()))
{
- bNotMatch = sal_True;
+ bNotMatch = true;
break;
}
}else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
const SvxBrushItem* pBrsh1 = aFmt.GetBrush();
const SvxBrushItem* pBrsh2 = _pSet->pBrushItem;
- sal_Bool bIsMatch = false;
+ bool bIsMatch = false;
if (pBrsh1==pBrsh2) bIsMatch = true;
if (pBrsh1 && pBrsh2) {
const Graphic* pGrf1 = pBrsh1->GetGraphic();;
@@ -1669,7 +1669,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
}
}
if (!bIsMatch) {
- bNotMatch = sal_True;
+ bNotMatch = true;
break;
}
} else
@@ -1683,7 +1683,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
_pSet->nNumAlignAt == aFmt.GetFirstLineIndent() &&
_pSet->nNumIndentAt == aFmt.GetIndentAt()))
{
- bNotMatch = sal_True;
+ bNotMatch = true;
break;
}
}
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 872c645cd982..be987fbd2d16 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1001,7 +1001,7 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)) )
{
const SfxBoolItem* pItem= (const SfxBoolItem*)pState;
- const sal_Bool aBool = (sal_Bool)pItem->GetValue();
+ const bool aBool = pItem->GetValue();
const sal_uInt16 nIdNumber = mpTBxNumBullet->GetItemId(UNO_DEFAULTNUMBERING);
const sal_uInt16 nIdBullet = mpTBxNumBullet->GetItemId(UNO_DEFAULTBULLET);
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 5dd6e99495d4..99de4c484e16 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -52,7 +52,7 @@ namespace svx { namespace sidebar {
static Font& lcl_GetDefaultBulletFont()
{
- static sal_Bool bInit = 0;
+ static bool bInit = false;
static Font aDefBulletFont( OUString( "StarSymbol" ),
OUString(), Size( 0, 14 ) );
if(!bInit)
@@ -62,7 +62,7 @@ static Font& lcl_GetDefaultBulletFont()
aDefBulletFont.SetPitch( PITCH_DONTKNOW );
aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
aDefBulletFont.SetTransparent( true );
- bInit = sal_True;
+ bInit = true;
}
return aDefBulletFont;
}
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index e0befd3cd957..3292a73ebf13 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -465,7 +465,7 @@ void SmartTagMgr::ReadConfiguration( bool bExcludedTypes, bool bRecognize )
if ( bRecognize )
{
Any aAny = mxConfigurationSettings->getPropertyValue( "RecognizeSmartTags" );
- sal_Bool bValue = sal_True;
+ bool bValue = true;
aAny >>= bValue;
mbLabelTextWithSmartTags = bValue;
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 76e75ac82318..77f3d9d61577 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -149,8 +149,8 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion)
//Rectangle aRegionRectanglePixel;
// MapModes off
- sal_Bool bMapModeWasEnabledDest(mrOutputDevice.IsMapModeEnabled());
- sal_Bool bMapModeWasEnabledSource(maPreRenderDevice.IsMapModeEnabled());
+ bool bMapModeWasEnabledDest(mrOutputDevice.IsMapModeEnabled());
+ bool bMapModeWasEnabledSource(maPreRenderDevice.IsMapModeEnabled());
mrOutputDevice.EnableMapMode(false);
maPreRenderDevice.EnableMapMode(false);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index a77dcd408cc6..879bed916326 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1399,8 +1399,8 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_
{
if ( nVersion )
{
- sal_Bool bValue;
- rStream.ReadUChar( bValue );
+ bool bValue;
+ rStream.ReadCharAsBool( bValue );
SetValue( bValue );
}
}
@@ -1425,7 +1425,7 @@ SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVer
{
if ( nItemVersion )
{
- sal_Bool bValue = (sal_Bool)GetValue();
+ bool bValue = GetValue();
rOut.WriteUChar( bValue );
}
return rOut;
@@ -1440,13 +1440,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
}
bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- sal_Bool bValue = (sal_Bool)GetValue();
+ bool bValue = GetValue();
rVal <<= bValue;
return true;
}
bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
- sal_Bool bValue = sal_Bool();
+ bool bValue;
if( !( rVal >>= bValue ) )
return false;
SetValue( bValue );
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 3b3a15c10259..de53aa3c0a19 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -565,7 +565,7 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
// If the drag point was limited and Ortho is active, do
// the small ortho correction (reduction) -> last parameter to FALSE.
- sal_Bool bDidLimit(ImpLimitToWorkArea(aPnt));
+ bool bDidLimit(ImpLimitToWorkArea(aPnt));
if(bDidLimit && IsOrtho())
{
if(aDragStat.IsOrtho8Possible())
@@ -752,7 +752,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
{
// for migration from XOR, replace DrawDragObj here to create
// overlay objects instead.
- sal_Bool bUseSolidDragging(IsSolidDragging());
+ bool bUseSolidDragging(IsSolidDragging());
// #i101648# check if dragged object is a naked SdrObject (not
// a derivation). This is e.g. used in SW Frame construction
@@ -772,7 +772,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
if(XLINE_NONE == eLine && XFILL_NONE == eFill)
{
- bUseSolidDragging = sal_False;
+ bUseSolidDragging = false;
}
}
@@ -781,7 +781,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
{
if(pAktCreate->ISA(SdrUnoObj))
{
- bUseSolidDragging = sal_False;
+ bUseSolidDragging = false;
}
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 35753127b286..eae3a6cf867b 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -170,7 +170,7 @@ bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const
{
Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
bool bTail=eDragHdl==HDL_POLY; // drag tail
- sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // specific to object
+ bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // specific to object
if (!bTail)
{ // for bTail, TakeActionRect already does the right thing
if (bOwn)
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 29abc34bb9b5..ff62dd06e3f6 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -533,7 +533,7 @@ void SdrEditView::CheckPossibilities()
}
}
- sal_Bool bNoMovRotFound=sal_False;
+ bool bNoMovRotFound=false;
const SdrPageView* pPV0=NULL;
for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
@@ -547,8 +547,8 @@ void SdrEditView::CheckPossibilities()
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- sal_Bool bMovPrt=pObj->IsMoveProtect();
- sal_Bool bSizPrt=pObj->IsResizeProtect();
+ bool bMovPrt=pObj->IsMoveProtect();
+ bool bSizPrt=pObj->IsResizeProtect();
if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // count MovableObjs
if (bMovPrt) bMoveProtect=true;
if (bSizPrt) bResizeProtect=true;
@@ -574,7 +574,7 @@ void SdrEditView::CheckPossibilities()
if (!bMoreThanOneNoMovRot) {
if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) {
bMoreThanOneNoMovRot=bNoMovRotFound;
- bNoMovRotFound=sal_True;
+ bNoMovRotFound=true;
}
}
@@ -629,7 +629,7 @@ void SdrEditView::CheckPossibilities()
bPossibilitiesDirty=false;
if (bReadOnly) {
- sal_Bool bMerker1=bGrpEnterPossible;
+ bool bMerker1=bGrpEnterPossible;
ImpResetPossibilityFlags();
bReadOnly=true;
bGrpEnterPossible=bMerker1;
@@ -661,7 +661,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
Rectangle aObjRect(pObj->GetCurrentBoundRect());
Rectangle aPgRect(pM->GetPageView()->GetPageRect());
if (!aObjRect.IsOver(aPgRect)) {
- sal_Bool bFnd=sal_False;
+ bool bFnd=false;
SdrPageView* pPV = GetSdrPageView();
if(pPV)
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 27f68587d6f7..e0007cb0dec1 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -132,7 +132,7 @@ void OLEObjCache::UnloadOnDemand()
// it is important to get object without reinitialization to avoid reentrance
uno::Reference< embed::XEmbeddedObject > xUnloadObj = pUnloadObj->GetObjRef_NoInit();
- sal_Bool bUnload = SdrOle2Obj::CanUnloadRunningObj( xUnloadObj, pUnloadObj->GetAspect() );
+ bool bUnload = SdrOle2Obj::CanUnloadRunningObj( xUnloadObj, pUnloadObj->GetAspect() );
// check whether the object can be unloaded before looking for the parent objects
if ( xUnloadObj.is() && bUnload )
@@ -147,7 +147,7 @@ void OLEObjCache::UnloadOnDemand()
{
uno::Reference< frame::XModel > xParentModel = pCacheObj->GetParentXModel();
if ( xUnloadModel == xParentModel )
- bUnload = sal_False; // the object has running embedded objects
+ bUnload = false; // the object has running embedded objects
}
}
}
@@ -298,7 +298,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
Color aCol2(COL_WHITE);
// when hatched background is activated, use object fill color as hatch color
- sal_Bool bFillHatchBackground = ((const XFillBackgroundItem&)(rSet.Get(XATTR_FILLBACKGROUND))).GetValue();
+ bool bFillHatchBackground = ((const XFillBackgroundItem&)(rSet.Get(XATTR_FILLBACKGROUND))).GetValue();
if(bFillHatchBackground)
{
aCol2 = ((const XFillColorItem&)(rSet.Get(XATTR_FILLCOLOR))).GetColorValue();
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index c912c55c48bb..6535394644ba 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1146,7 +1146,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
OUString aNewText(pBrowse->GetNewEntryValue());
- sal_Bool bDel( aNewText == "del"
+ bool bDel( aNewText == "del"
|| aNewText == "Del"
|| aNewText == "DEL"
|| aNewText == "default"
@@ -1199,7 +1199,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
if (aNewText == "EIN") nLongVal=1;
if (aNewText == "ON") nLongVal=1;
if (aNewText == "YES") nLongVal=1;
- ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
+ ((SfxBoolItem*)pNewItem)->SetValue(nLongVal == 1);
} break;
case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index cb39bb5dc865..85e22ad43255 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1146,7 +1146,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
SdrObject* SdrCircObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
- const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
+ const bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
SdrObject* pRet = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aCircPolygon), bFill, bBezier);
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index f8e868e670b0..63824ad265b4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -711,7 +711,7 @@ bool SdrGrafObj::ImpUpdateGraphicLink( bool bAsynchron ) const
void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic )
{
- const sal_Bool bIsChanged = GetModel()->IsChanged();
+ const bool bIsChanged = GetModel()->IsChanged();
NbcSetGraphic( rGraphic );
ActionChanged();
BroadcastObjectChange();
@@ -1353,8 +1353,8 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 );
com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
- sal_Bool bAllowPartialStreamRead = true;
- sal_Bool bCreateNativeLink = false;
+ bool bAllowPartialStreamRead = true;
+ bool bCreateNativeLink = false;
(*pFilterData)[ 0 ].Name = "PreviewSizeHint";
(*pFilterData)[ 0 ].Value <<= aPreviewSizeHint;
(*pFilterData)[ 1 ].Name = "AllowPartialStreamRead";
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 0eace2ffb8dd..65e14cb0b516 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -81,8 +81,8 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind
{
OUString aStr;
Fraction aMeasureScale(1, 1);
- sal_Bool bTextRota90(sal_False);
- sal_Bool bShowUnit(sal_False);
+ bool bTextRota90(false);
+ bool bShowUnit(false);
FieldUnit eMeasureUnit(FUNIT_NONE);
FieldUnit eModUIUnit(FUNIT_NONE);
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 8a62a66d138a..0a076f7e75f4 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -355,7 +355,7 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp
sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
throw ( uno::RuntimeException, std::exception )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SolarMutexGuard aGuard;
if ( mpObj )
{
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index cbf030ed9892..d52e69eb1b7a 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1054,7 +1054,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum());
const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
- sal_Bool bClose(IsClosed(meObjectKind));
+ bool bClose(IsClosed(meObjectKind));
if(bClose)
nPntAnz--;
@@ -1084,7 +1084,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
else if(nPntAnz > 1)
{
sal_uInt16 nPntMax(nPntAnz - 1);
- sal_Bool bIsClosed(IsClosed(meObjectKind));
+ bool bIsClosed(IsClosed(meObjectKind));
bool bPt1(nPntNum > 0);
bool bPt2(nPntNum < nPntMax);
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 792f82b85939..986ef3665138 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -96,7 +96,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
if (aSiz.Width()<2) aSiz.Width()=2;
if (aSiz.Height()<2) aSiz.Height()=2;
- sal_Bool bInEditMode = IsInEditMode();
+ bool bInEditMode = IsInEditMode();
if(!bInEditMode)
{
@@ -249,7 +249,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
aStyleName += OUString('|');
aStyleName += aFam.makeStringAndClear();
- sal_Bool bFnd(sal_False);
+ bool bFnd(false);
sal_uInt32 nNum(aStyleNames.size());
while(!bFnd && nNum > 0)
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 0d9c70d87dff..4c7754ed074d 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -172,7 +172,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
SdrTextAniKind eAniKind=GetTextAniKind();
SdrTextAniDirection eAniDirection=GetTextAniDirection();
- sal_Bool bInEditMode = IsInEditMode();
+ bool bInEditMode = IsInEditMode();
if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
{
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index d5fd058fd242..0db9bd371dec 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -219,10 +219,10 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/
const sal_Int32 nRowCount = mxTable->getRowCount();
const sal_Int32 nColCount = mxTable->getColumnCount();
- sal_Bool bRowOrColumnChanged = sal_False;
+ bool bRowOrColumnChanged = false;
if (mRowCount != nRowCount || mColCount != nColCount )
{
- bRowOrColumnChanged = sal_True;
+ bRowOrColumnChanged = true;
mRowCount = nRowCount;
mColCount = nColCount;
}
@@ -947,7 +947,7 @@ void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent
{
sal_Int32 nIndex = xAccCell->getAccessibleIndexInParent(),
nCount = getSelectedAccessibleChildCount();
- sal_Bool bSelected = isAccessibleChildSelected(nIndex);
+ bool bSelected = isAccessibleChildSelected(nIndex);
if (mnPreviousSelectionCount == 0 && nCount > 0 && bSelected)
{
xAccCell->SetState(AccessibleStateType::SELECTED);
@@ -970,7 +970,7 @@ void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent
// Get the currently active cell which is text editing
AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell()
{
- sal_Bool bCellEditing = sal_False;
+ bool bCellEditing = false;
Reference< AccessibleCell > xAccCell;
AccessibleCell* pAccCell = NULL;
SvxTableController* pController = getTableController();
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 82bbc0311d0f..51d0d656248c 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -356,7 +356,7 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th
, mnCellContentType( CellContentType_EMPTY )
, mfValue( 0.0 )
, mnError( 0 )
-, mbMerged( sal_False )
+, mbMerged( false )
, mnRowSpan( 1 )
, mnColSpan( 1 )
, mxTable( rTableObj.getTable() )
@@ -423,7 +423,7 @@ void Cell::SetModel(SdrModel* pNewModel)
SetEditSource( new SvxTextEditSource( &GetObject(), this, static_cast< XWeak * >( this ) ) );
}
- SetStyleSheet( 0, sal_True );
+ SetStyleSheet( 0, true );
SdrText::SetModel( pNewModel );
ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
}
@@ -433,11 +433,11 @@ void Cell::SetModel(SdrModel* pNewModel)
void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan )
{
- if( (mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || (mbMerged != sal_False) )
+ if( (mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || (mbMerged != false) )
{
mnColSpan = nColumnSpan;
mnRowSpan = nRowSpan;
- mbMerged = sal_False;
+ mbMerged = false;
notifyModified();
}
}
@@ -467,7 +467,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
rOutliner.Clear();
xSourceCell->SetOutlinerParaObject(rOutliner.CreateParaObject());
rOutliner.Clear();
- SetStyleSheet( GetStyleSheet(), sal_True );
+ SetStyleSheet( GetStyleSheet(), true );
}
}
@@ -505,7 +505,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell )
if(rSourceTableObj.GetModel() != rTableObj.GetModel())
{
- SetStyleSheet( 0, sal_True );
+ SetStyleSheet( 0, true );
}
}
}
@@ -516,7 +516,7 @@ void Cell::setMerged()
{
if( !mbMerged )
{
- mbMerged = sal_True;
+ mbMerged = true;
notifyModified();
}
}
@@ -583,7 +583,7 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const
-void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr )
+void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr )
{
// only allow cell styles for cells
if( pStyleSheet && pStyleSheet->GetFamily() != SFX_STYLE_FAMILY_FRAME )
@@ -658,7 +658,7 @@ const SfxItemSet& Cell::GetItemSet() const
-void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems)
+void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems)
{
if( mpProperties )
{
@@ -1032,7 +1032,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
throw IllegalArgumentException();
SfxUnoStyleSheet* pStyle = SfxUnoStyleSheet::getUnoStyleSheet(xStyle);
- SetStyleSheet( pStyle, sal_True );
+ SetStyleSheet( pStyle, true );
return;
}
case OWN_ATTR_TABLEBORDER:
@@ -1048,7 +1048,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
SvxBoxInfoItem aBoxInfo( SDRATTR_TABLE_BORDER_INNER );
SvxBorderLine aLine;
- sal_Bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false);
+ bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false);
aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_TOP);
aBoxInfo.SetValid(VALID_TOP, pBorder->IsTopLineValid);
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 736f68de82b3..c5a00788b1c4 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -74,13 +74,13 @@ public:
SVX_DLLPRIVATE ::Rectangle& getCellRect() { return maCellRect; }
OutlinerParaObject* GetEditOutlinerParaObject() const;
- SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr );
+ SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr );
SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE;
SVX_DLLPRIVATE virtual const Rectangle& GetCurrentBoundRect() const;
SVX_DLLPRIVATE virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const SAL_OVERRIDE;
- SVX_DLLPRIVATE void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems);
+ SVX_DLLPRIVATE void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems);
void SetMergedItem(const SfxPoolItem& rItem);
SVX_DLLPRIVATE sal_Int32 getMinimumWidth();
@@ -223,7 +223,7 @@ private:
OUString msFormula;
double mfValue;
::sal_Int32 mnError;
- sal_Bool mbMerged;
+ bool mbMerged;
::sal_Int32 mnRowSpan;
::sal_Int32 mnColSpan;
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 306f01b06967..54c017b3ea62 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -559,23 +559,6 @@ sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exce
-sal_Bool SAL_CALL CellCursor::isUnmergeable( ) throw (RuntimeException)
-{
- // this is true if there is at least one merged cell in the current range
- for( sal_Int32 nRow = mnTop; nRow <= mnBottom; nRow++ )
- {
- for( sal_Int32 nCol = mnLeft; nCol <= mnRight; nCol++ )
- {
- CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) );
- if( xCell.is() && ( (xCell->getRowSpan() > 1) || (xCell->getColumnSpan() > 1) ) )
- return sal_True;
- }
- }
- return sal_False;
-}
-
-
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index 6c4f650f5e0d..bdeee58c3a1b 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -59,7 +59,6 @@ public:
virtual void SAL_CALL merge( ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isMergeable( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isUnmergeable( ) throw (::com::sun::star::uno::RuntimeException);
protected:
bool GetMergedSelection( CellPos& rStart, CellPos& rEnd );
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 072f50272a75..e2ba8467e99c 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -51,9 +51,9 @@ TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn )
, mxTableModel( xTableModel )
, mnColumn( nColumn )
, mnWidth( 0 )
-, mbOptimalWidth( sal_True )
-, mbIsVisible( sal_True )
-, mbIsStartOfNewPage( sal_False )
+, mbOptimalWidth( true )
+, mbIsVisible( true )
+, mbIsStartOfNewPage( false )
{
}
@@ -174,7 +174,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a
}
case Property_OptimalWidth:
{
- sal_Bool bOptimalWidth = mbOptimalWidth;
+ bool bOptimalWidth = mbOptimalWidth;
bOk = aValue >>= bOptimalWidth;
if( bOk && (mbOptimalWidth != bOptimalWidth) )
{
@@ -187,7 +187,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a
}
case Property_IsVisible:
{
- sal_Bool bIsVisible = mbIsVisible;
+ bool bIsVisible = mbIsVisible;
bOk = aValue >>= bIsVisible;
if( bOk && (mbIsVisible != bIsVisible) )
{
@@ -199,7 +199,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a
case Property_IsStartOfNewPage:
{
- sal_Bool bIsStartOfNewPage = mbIsStartOfNewPage;
+ bool bIsStartOfNewPage = mbIsStartOfNewPage;
bOk = aValue >>= bIsStartOfNewPage;
if( bOk && (mbIsStartOfNewPage != bIsStartOfNewPage) )
{
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 20b589c88bfc..2f9223f5807e 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -69,9 +69,9 @@ private:
TableModelRef mxTableModel;
sal_Int32 mnColumn;
sal_Int32 mnWidth;
- sal_Bool mbOptimalWidth;
- sal_Bool mbIsVisible;
- sal_Bool mbIsStartOfNewPage;
+ bool mbOptimalWidth;
+ bool mbIsVisible;
+ bool mbIsStartOfNewPage;
OUString maName;
};
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index d65585e89910..312ea578f95a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -908,7 +908,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
if( bUndo )
xCell->AddUndo();
- xCell->SetMergedItemSetAndBroadcast( aSet, sal_True );
+ xCell->SetMergedItemSetAndBroadcast( aSet, true );
}
}
}
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index aab0f403d747..01c68382ee73 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -571,7 +571,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
{
sal_Int32 nColWidth = 0;
Reference< XPropertySet > xColSet( xCols->getByIndex( nCol ), UNO_QUERY_THROW );
- sal_Bool bOptimal = sal_False;
+ bool bOptimal = false;
xColSet->getPropertyValue( sOptimalSize ) >>= bOptimal;
if( bOptimal )
{
@@ -722,7 +722,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
sal_Int32 nRowHeight = 0;
Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW );
- sal_Bool bOptimal = sal_False;
+ bool bOptimal = false;
xRowSet->getPropertyValue( sOptimalSize ) >>= bOptimal;
if( bOptimal )
{
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 226fd401aa3e..15cfad0c0134 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -117,7 +117,7 @@ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVec
TableModel::TableModel( SdrTableObj* pTableObj )
: TableModelBase( m_aMutex )
, mpTableObj( pTableObj )
-, mbModified( sal_False )
+, mbModified( false )
, mbNotifyPending( false )
, mnNotifyLock( 0 )
{
@@ -126,7 +126,7 @@ TableModel::TableModel( SdrTableObj* pTableObj )
TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTable )
: TableModelBase( m_aMutex )
, mpTableObj( pTableObj )
-, mbModified( sal_False )
+, mbModified( false )
, mbNotifyPending( false )
, mnNotifyLock( 0 )
{
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index fd85a5102c11..24c004554fa0 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -182,7 +182,7 @@ private:
SdrTableObj* mpTableObj;
- sal_Bool mbModified;
+ bool mbModified;
bool mbNotifyPending;
sal_Int32 mnNotifyLock;
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index b13f563514a4..7434db61fb0a 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -52,9 +52,9 @@ TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32
, mxTableModel( xTableModel )
, mnRow( nRow )
, mnHeight( 0 )
-, mbOptimalHeight( sal_True )
-, mbIsVisible( sal_True )
-, mbIsStartOfNewPage( sal_False )
+, mbOptimalHeight( true )
+, mbIsVisible( true )
+, mbIsStartOfNewPage( false )
{
if( nColumns < 20 )
maCells.reserve( 20 );
@@ -248,7 +248,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal
case Property_OptimalHeight:
{
- sal_Bool bOptimalHeight = mbOptimalHeight;
+ bool bOptimalHeight = mbOptimalHeight;
bOk = aValue >>= bOptimalHeight;
if( bOk && (mbOptimalHeight != bOptimalHeight) )
{
@@ -261,7 +261,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal
}
case Property_IsVisible:
{
- sal_Bool bIsVisible = mbIsVisible;
+ bool bIsVisible = mbIsVisible;
bOk = aValue >>= bIsVisible;
if( bOk && (mbIsVisible != bIsVisible) )
{
@@ -273,7 +273,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal
case Property_IsStartOfNewPage:
{
- sal_Bool bIsStartOfNewPage = mbIsStartOfNewPage;
+ bool bIsStartOfNewPage = mbIsStartOfNewPage;
bOk = aValue >>= bIsStartOfNewPage;
if( bOk && (mbIsStartOfNewPage != bIsStartOfNewPage) )
{
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 052d120142ca..0d88268879f4 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -73,9 +73,9 @@ private:
CellVector maCells;
sal_Int32 mnRow;
sal_Int32 mnHeight;
- sal_Bool mbOptimalHeight;
- sal_Bool mbIsVisible;
- sal_Bool mbIsStartOfNewPage;
+ bool mbOptimalHeight;
+ bool mbIsVisible;
+ bool mbIsStartOfNewPage;
OUString maName;
};
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index f707910eec97..2b5779cc1365 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -63,7 +63,7 @@ private:
OUString msFormula;
double mfValue;
::sal_Int32 mnError;
- sal_Bool mbMerged;
+ bool mbMerged;
::sal_Int32 mnRowSpan;
::sal_Int32 mnColSpan;
@@ -171,9 +171,9 @@ private:
{
sal_Int32 mnColumn;
sal_Int32 mnWidth;
- sal_Bool mbOptimalWidth;
- sal_Bool mbIsVisible;
- sal_Bool mbIsStartOfNewPage;
+ bool mbOptimalWidth;
+ bool mbIsVisible;
+ bool mbIsStartOfNewPage;
OUString maName;
};
@@ -204,9 +204,9 @@ private:
CellVector maCells;
sal_Int32 mnRow;
sal_Int32 mnHeight;
- sal_Bool mbOptimalHeight;
- sal_Bool mbIsVisible;
- sal_Bool mbIsStartOfNewPage;
+ bool mbOptimalHeight;
+ bool mbIsVisible;
+ bool mbIsStartOfNewPage;
OUString maName;
};
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index b0e3deaa9d2b..1f7281d73f2b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -512,7 +512,7 @@ private:
DECL_LINK( SelectHdl, void * );
void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
- void implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled );
+ void implSetKernCharacterPairs( bool bKernOnOff, bool bEnabled );
};
@@ -572,7 +572,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
-void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled )
+void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnabled )
{
enableEntry( 6, bEnabled );
checkEntry( 6, bEnabled );
@@ -599,11 +599,11 @@ void FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::fram
{
if( !Event.IsEnabled )
{
- implSetKernCharacterPairs( 0, false );
+ implSetKernCharacterPairs( false, false );
}
else
{
- sal_Bool bValue = sal_False;
+ bool bValue = false;
if( Event.State >>= bValue )
implSetKernCharacterPairs( bValue, true );
}
@@ -640,11 +640,11 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl)
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = msFontworkKernCharacterPairs.copy(5);
- aArgs[0].Value <<= (sal_Bool) sal_True;
+ aArgs[0].Value <<= true;
mrController.dispatchCommand( msFontworkKernCharacterPairs, aArgs );
- implSetKernCharacterPairs( sal_True, true );
+ implSetKernCharacterPairs( true, true );
}
else if( nSelection >= 0 )
{
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0f0b04ef6dfa..532e6ef929f9 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -63,7 +63,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush()
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = "PersistentCopy";
- aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) );
+ aArgs[0].Value = makeAny( m_bPersistentCopy );
Dispatch( OUString( ".uno:FormatPaintbrush" )
, aArgs );
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9c36b7221dec..d50e9dbde572 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -259,7 +259,7 @@ class SvxFrameWindow_Impl : public SfxPopupWindow
private:
SvxFrmValueSet_Impl aFrameSet;
ImageList aImgList;
- sal_Bool bParagraphMode;
+ bool bParagraphMode;
DECL_LINK( SelectHdl, void * );
@@ -967,7 +967,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
void SvxFontNameBox_Impl::EnableControls_Impl()
{
SvtFontOptions aFontOpt;
- sal_Bool bEnable = aFontOpt.IsFontHistoryEnabled();
+ bool bEnable = aFontOpt.IsFontHistoryEnabled();
sal_uInt16 nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
if ( GetMaxMRUCount() != nEntries )
{
@@ -1268,7 +1268,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram
SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
- bParagraphMode(sal_False)
+ bParagraphMode(false)
{
BindListener();
@@ -1497,7 +1497,7 @@ void SvxFrameWindow_Impl::StateChanged(
if ( pItem )
{
- bParagraphMode = (sal_Bool)pItem->GetValue();
+ bParagraphMode = pItem->GetValue();
//initial calls mustn't insert or remove elements
if(aFrameSet.GetItemCount())
{
@@ -1741,14 +1741,14 @@ struct SvxStyleToolBoxControl::Impl
OUString aClearForm;
OUString aMore;
::std::vector< OUString > aDefaultStyles;
- sal_Bool bSpecModeWriter;
- sal_Bool bSpecModeCalc;
+ bool bSpecModeWriter;
+ bool bSpecModeCalc;
inline Impl( void )
:aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
,aMore ( SVX_RESSTR( RID_SVXSTR_MORE ) )
- ,bSpecModeWriter ( sal_False )
- ,bSpecModeCalc ( sal_False )
+ ,bSpecModeWriter ( false )
+ ,bSpecModeCalc ( false )
{
@@ -1792,7 +1792,7 @@ struct SvxStyleToolBoxControl::Impl
}
}
- else if( 0 != (
+ else if( (
bSpecModeCalc = xServices->supportsService(OUString(
"com.sun.star.sheet.SpreadsheetDocument"))))
{
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 5b8bf487a388..6df2de77d6d2 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -68,8 +68,8 @@ static const sal_Int32 REMEMBER_SIZE = 10;
void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame,
const ToolBox* pToolBox,
- const sal_Bool aSearchBackwards = false,
- const sal_Bool aFindAll = false )
+ const bool aSearchBackwards = false,
+ const bool aFindAll = false )
{
css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create( rxContext ) );
css::util::URL aURL;
@@ -77,7 +77,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
xURLTransformer->parseStrict(aURL);
OUString sFindText;
- sal_Bool aMatchCase = false;
+ bool aMatchCase = false;
if ( pToolBox )
{
sal_uInt16 nItemCount = pToolBox->GetItemCount();
@@ -192,8 +192,8 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
case EVENT_KEYINPUT:
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
- sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift();
- sal_Bool bMod1 = pKeyEvent->GetKeyCode().IsMod1();
+ bool bShift = pKeyEvent->GetKeyCode().IsShift();
+ bool bMod1 = pKeyEvent->GetKeyCode().IsMod1();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
if ( KEY_ESCAPE == nCode || (bMod1 && (KEY_F == nCode)) )
@@ -583,7 +583,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
ToolBox* pToolBox = (ToolBox*)pWindow;
- impl_executeSearch(m_xContext, m_xFrame, pToolBox, sal_Bool( meType == UP ));
+ impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP );
css::frame::FeatureStateEvent aEvent;
aEvent.FeatureURL.Complete = OUString(COMMAND_APPENDSEARCHHISTORY);
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 30bd2b39fc9f..753b7827db63 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -82,7 +82,7 @@ void SvxTbxCtlDraw::toggleToolbox()
Reference< XLayoutManager > xLayoutMgr = getLayoutManager();
if ( xLayoutMgr.is() )
{
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
if ( xLayoutMgr->isElementVisible( m_sToolboxName ) )
{
xLayoutMgr->hideElement( m_sToolboxName );
@@ -90,7 +90,7 @@ void SvxTbxCtlDraw::toggleToolbox()
}
else
{
- bCheck = sal_True;
+ bCheck = true;
xLayoutMgr->createElement( m_sToolboxName );
xLayoutMgr->showElement( m_sToolboxName );
}
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 74e980a0a323..b84ca8b381d2 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -62,7 +62,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
{
SvtLanguageOptions aLangOptions;
bool bCalc = false;
- sal_Bool bEnabled = sal_False;
+ bool bEnabled = false;
if ( nSID == SID_VERTICALTEXT_STATE )
bEnabled = aLangOptions.IsVerticalTextEnabled();
else if ( nSID == SID_CTLFONT_STATE )
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 486aaff78abd..06169c7d3521 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -150,7 +150,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
if( pAny )
{
- sal_Bool bOn;
+ bool bOn;
(*pAny) >>= bOn;
bOn = !bOn;
(*pAny) <<= bOn;
@@ -353,7 +353,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
sal_Int32 nSurface = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_SURFACE))->GetValue();
ShadeMode eShadeMode( ShadeMode_FLAT );
- sal_Bool bMetal = sal_False;
+ bool bMetal = false;
double fSpecularity = 0;
double fDiffusion = 0;
@@ -407,7 +407,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
sal_Int32 nLevel = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_LIGHTING_INTENSITY))->GetValue();
double fBrightness;
- sal_Bool bHarsh2;
+ bool bHarsh2;
double fLevel1;
double fLevel2;
@@ -415,19 +415,19 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
{
case 0: // bright
fBrightness = 34.0;
- bHarsh2 = sal_False;
+ bHarsh2 = false;
fLevel1 = 66.0;
fLevel2 = 66.0;
break;
case 1: // normal
fBrightness = 15.0;
- bHarsh2 = sal_False;
+ bHarsh2 = false;
fLevel1 = 67.0;
fLevel2 = 37.0;
break;
case 2: // dim
fBrightness = 6.0;
- bHarsh2 = sal_True;
+ bHarsh2 = true;
fLevel1 = 79.0;
fLevel2 = 21.0;
break;
@@ -823,7 +823,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
- sal_Bool bParallel = sal_True;
+ bool bParallel = true;
pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sProjectionMode );
ProjectionMode eProjectionMode;
if( pAny && ( *pAny >>= eProjectionMode ) )
@@ -831,9 +831,9 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
if( nFinalProjection == -1 )
{
- nFinalProjection = bParallel;
+ nFinalProjection = bParallel ? 1 : 0;
}
- else if( nFinalProjection != bParallel )
+ else if( nFinalProjection != (bParallel ? 1 : 0) )
{
nFinalProjection = -1;
break;
@@ -889,7 +889,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
if( eShadeMode == ShadeMode_FLAT )
{
- sal_Bool bMetal = sal_False;
+ bool bMetal = false;
pAny = aGeometryItem.GetPropertyValueByName( sExtrusion, sMetal );
if( pAny )
*pAny >>= bMetal;
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index ab5693244d77..b838520dee25 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -115,7 +115,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- sal_Bool bChecked = sal_False;
+ bool bChecked = false;
for( i = 0; i < nCount; i++ )
{
SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
@@ -123,7 +123,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
{
SvxKerningItem& rKerningItem = (SvxKerningItem&)pObj->GetMergedItem( EE_CHAR_KERNING );
if ( rKerningItem.GetValue() )
- bChecked = sal_True;
+ bChecked = true;
}
}
rSet.Put( SfxBoolItem( SID_FONTWORK_KERN_CHARACTER_PAIRS, bChecked ) );
@@ -243,7 +243,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
- sal_Bool bFound = sal_False;
+ bool bFound = false;
for(i=0;(i<nCount) && !bFound ; i++)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
@@ -275,7 +275,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights );
if( pAny )
{
- sal_Bool bOn;
+ bool bOn;
(*pAny) >>= bOn;
bOn = !bOn;
(*pAny) <<= bOn;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 63e11d06847f..38907746900c 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -466,7 +466,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
m_pCT_DictionaryToTraditional = new DictionaryList(*mpToTraditionalContainer, 0);
SvtLinguConfig aLngCfg;
- sal_Bool bValue = sal_Bool();
+ bool bValue;
Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_REVERSE_MAPPING ) ) );
if( aAny >>= bValue )
m_pCB_Reverse->Check( bValue );
@@ -789,7 +789,7 @@ short ChineseDictionaryDialog::Execute()
//save settings to configuration
SvtLinguConfig aLngCfg;
Any aAny;
- aAny <<= sal_Bool( !!m_pCB_Reverse->IsChecked() );
+ aAny <<= m_pCB_Reverse->IsChecked();
aLngCfg.SetProperty( OUString( UPN_IS_REVERSE_MAPPING ), aAny );
m_pCT_DictionaryToSimplified->save();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index a2c1a54542c4..7dbb8d3a41aa 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -206,9 +206,9 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString
{
uno::Any aRet;
- sal_Bool bDirectionToSimplified = sal_True;
- sal_Bool bUseCharacterVariants = sal_False;
- sal_Bool bTranslateCommonTerms = sal_False;
+ bool bDirectionToSimplified = true;
+ bool bUseCharacterVariants = false;
+ bool bTranslateCommonTerms = false;
{
SolarMutexGuard aSolarGuard;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 5f279266d399..ae0e1b413755 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -47,7 +47,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
get(m_pCB_Translate_Commonterms, "commonterms");
SvtLinguConfig aLngCfg;
- sal_Bool bValue = sal_Bool();
+ bool bValue;
Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) );
aAny >>= bValue;
if( bValue )
@@ -73,8 +73,8 @@ ChineseTranslationDialog::~ChineseTranslationDialog()
}
}
-void ChineseTranslationDialog::getSettings( sal_Bool& rbDirectionToSimplified
- , sal_Bool& rbTranslateCommonTerms ) const
+void ChineseTranslationDialog::getSettings( bool& rbDirectionToSimplified
+ , bool& rbTranslateCommonTerms ) const
{
rbDirectionToSimplified = m_pRB_To_Simplified->IsChecked();
rbTranslateCommonTerms = m_pCB_Translate_Commonterms->IsChecked();
@@ -85,9 +85,9 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl)
//save settings to configuration
SvtLinguConfig aLngCfg;
Any aAny;
- aAny <<= sal_Bool( !!m_pRB_To_Simplified->IsChecked() );
+ aAny <<= m_pRB_To_Simplified->IsChecked();
aLngCfg.SetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny );
- aAny <<= sal_Bool( !!m_pCB_Translate_Commonterms->IsChecked() );
+ aAny <<= m_pCB_Translate_Commonterms->IsChecked();
aLngCfg.SetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny );
EndDialog( RET_OK );
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 999e31adb92d..6f01412bcc3b 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -42,8 +42,8 @@ public:
ChineseTranslationDialog( Window* pParent );
virtual ~ChineseTranslationDialog();
- void getSettings( sal_Bool& rbDirectionToSimplified
- , sal_Bool& rbTranslateCommonTerms ) const;
+ void getSettings( bool& rbDirectionToSimplified
+ , bool& rbTranslateCommonTerms ) const;
private:
DECL_LINK( DictionaryHdl, void* );
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index fe10726f4070..b032f7c65175 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -103,10 +103,10 @@ namespace {
sal_Int32 mnWidth;
sal_Int32 mnHeight;
- sal_Bool mbExportOnlyBackground;
- sal_Bool mbScrollText;
- sal_Bool mbUseHighContrast;
- sal_Bool mbTranslucent;
+ bool mbExportOnlyBackground;
+ bool mbScrollText;
+ bool mbUseHighContrast;
+ bool mbTranslucent;
Sequence< PropertyValue > maFilterData;
@@ -122,7 +122,7 @@ namespace {
, mbExportOnlyBackground( false )
, mbScrollText( false )
, mbUseHighContrast( false )
- , mbTranslucent( sal_False )
+ , mbTranslucent( false )
, maScaleX( 1, 1 )
, maScaleY( 1, 1 )
{
@@ -164,7 +164,7 @@ namespace {
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
void ParseSettings( const Sequence< PropertyValue >& aDescriptor, ExportSettings& rSettings );
- bool GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, sal_Bool bVectorType );
+ bool GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, bool bVectorType );
private:
Reference< XShape > mxShape;
@@ -181,7 +181,7 @@ namespace {
/** creates a bitmap that is optionaly transparent from a metafile
*/
- BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize )
+ BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, bool bTransparent, const Size* pSize )
{
BitmapEx aBmpEx;
@@ -352,7 +352,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
if( pField && pField->ISA( SvxPageField ) )
{
OUString aPageNumValue;
- sal_Bool bUpper = sal_False;
+ bool bUpper = false;
switch(mpDoc->GetPageNumType())
{
@@ -363,7 +363,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
aPageNumValue += OUString( (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a') );
break;
case SVX_ROMAN_UPPER:
- bUpper = sal_True;
+ bUpper = true;
/* Fall through */
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
@@ -616,7 +616,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
}
}
-bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, sal_Bool bVectorType )
+bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, bool bVectorType )
{
if( !mpDoc || !mpUnoPage )
return false;
@@ -788,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
if( rSettings.mbTranslucent )
{
Size aOutSize;
- aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
+ aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), true, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
}
}
}
@@ -1022,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
const sal_uInt16 nFilter = !aSettings.maMediaType.isEmpty()
? rFilter.GetExportFormatNumberForMediaType( aSettings.maMediaType )
: rFilter.GetExportFormatNumberForShortName( aSettings.maFilterName );
- sal_Bool bVectorType = !rFilter.IsExportPixelFormat( nFilter );
+ bool bVectorType = !rFilter.IsExportPixelFormat( nFilter );
// create the output stuff
Graphic aGraphic;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 860adcbd56e4..3ef214670aa3 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -109,7 +109,7 @@ namespace svx
NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool );
- sal_Bool next( OUString& rPrefix, OUString& rURL );
+ bool next( OUString& rPrefix, OUString& rURL );
};
}
@@ -129,7 +129,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool
mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0;
}
-sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
+bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
{
// we still need to process the current attribute
if( mpCurrentAttr && (mnCurrentAttr != USHRT_MAX) )
@@ -138,7 +138,7 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
rURL = mpCurrentAttr->GetNamespace( mnCurrentAttr );
mnCurrentAttr = mpCurrentAttr->GetNextNamespaceIndex( mnCurrentAttr );
- return sal_True;
+ return true;
}
// we need the next namespace item
@@ -201,7 +201,7 @@ Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchEleme
OUString aPrefix;
OUString aURL;
- sal_Bool bFound;
+ bool bFound;
do
{
@@ -248,7 +248,7 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim
OUString aPrefix;
OUString aURL;
- sal_Bool bFound;
+ bool bFound;
do
{
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index e25e526150b5..1855098072f6 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -124,7 +124,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
EJob impl_classifyJob(const css::util::URL& aURL);
- sal_Bool impl_doEmergencySave();
+ bool impl_doEmergencySave();
void impl_doRecovery();
@@ -179,7 +179,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL&
{
case RecoveryUI::E_DO_EMERGENCY_SAVE :
{
- sal_Bool bRet = impl_doEmergencySave();
+ bool bRet = impl_doEmergencySave();
aRet <<= bRet;
break;
}
@@ -275,7 +275,7 @@ RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL)
}
-sal_Bool RecoveryUI::impl_doEmergencySave()
+bool RecoveryUI::impl_doEmergencySave()
{
// create core service, which implements the real "emergency save" algorithm.
svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xContext, true);
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 52e91ff8e995..a243debc0467 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1621,7 +1621,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
{
case OWN_ATTR_VALUE_FILLBITMAP:
{
- sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
+ bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
const Graphic& rGraphic = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic();
if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE)
@@ -1653,7 +1653,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
}
else
{
- sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
+ bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true);
OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
aURL += OStringToOUString(rGrafObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US);
@@ -1688,7 +1688,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
case OWN_ATTR_VALUE_GRAPHIC:
{
- sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
+ bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() );
rValue <<= xGraphic;
if ( bSwapped )
@@ -1799,8 +1799,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
SdrAShapeObjGeoData aCustomShapeGeoData;
((SdrObjCustomShape*)mpObj.get())->SaveGeoData( aCustomShapeGeoData );
- sal_Bool bMirroredX = sal_False;
- sal_Bool bMirroredY = sal_False;
+ bool bMirroredX = false;
+ bool bMirroredY = false;
if ( mpObj.is() )
{
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 765d19fe4ef4..8a5d59ad1ec4 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -528,7 +528,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
}
case OWN_ATTR_3D_VALUE_POS_IS_CENTER:
{
- sal_Bool bNew = sal_False;
+ bool bNew = false;
// sal_Bool bPosIsCenter in das Objekt packen
if( rValue >>= bNew )
{
@@ -1113,7 +1113,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
}
case OWN_ATTR_3D_VALUE_LINEONLY:
{
- sal_Bool bNew = sal_False;
+ bool bNew = false;
if( rValue >>= bNew )
{
static_cast<E3dPolygonObj*>(mpObj.get())->SetLineOnly(bNew);
@@ -1163,7 +1163,7 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI
case OWN_ATTR_3D_VALUE_LINEONLY:
{
- rValue <<= (sal_Bool)static_cast<E3dPolygonObj*>(mpObj.get())->GetLineOnly();
+ rValue <<= static_cast<E3dPolygonObj*>(mpObj.get())->GetLineOnly();
break;
}
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 40a206760e3e..7de6b35b0a74 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -305,7 +305,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
if ( pProperty->nWID == OWN_ATTR_OLEMODEL || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT )
{
#if OSL_DEBUG_LEVEL > 0
- const sal_Bool bSuccess(pObj->AddOwnLightClient());
+ const bool bSuccess(pObj->AddOwnLightClient());
OSL_ENSURE( bSuccess, "An object without client is provided!" );
#else
pObj->AddOwnLightClient();
@@ -828,7 +828,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
case( OWN_ATTR_MEDIA_LOOP ):
{
- sal_Bool bLoop = sal_Bool();
+ bool bLoop;
if( rValue >>= bLoop )
{
@@ -840,7 +840,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
case( OWN_ATTR_MEDIA_MUTE ):
{
- sal_Bool bMute = sal_Bool();
+ bool bMute;
if( rValue >>= bMute )
{
@@ -923,11 +923,11 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPr
break;
case( OWN_ATTR_MEDIA_LOOP ):
- rValue <<= (sal_Bool) aItem.isLoop();
+ rValue <<= aItem.isLoop();
break;
case( OWN_ATTR_MEDIA_MUTE ):
- rValue <<= (sal_Bool) aItem.isMute();
+ rValue <<= aItem.isMute();
break;
case( OWN_ATTR_MEDIA_VOLUMEDB ):
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index df6270c13cb9..471db26da15f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2228,7 +2228,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case OWN_ATTR_MIRRORED:
{
- sal_Bool bMirror = sal_Bool();
+ bool bMirror;
if(rValue >>= bMirror )
{
SdrGrafObj* pObj = dynamic_cast< SdrGrafObj* >( mpObj.get() );
@@ -2446,7 +2446,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
case SDRATTR_OBJMOVEPROTECT:
{
- sal_Bool bMoveProtect = sal_Bool();
+ bool bMoveProtect;
if( rValue >>= bMoveProtect )
{
mpObj->SetMoveProtect(bMoveProtect);
@@ -2489,7 +2489,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
case SDRATTR_OBJPRINTABLE:
{
- sal_Bool bPrintable = sal_Bool();
+ bool bPrintable;
if( rValue >>= bPrintable )
{
mpObj->SetPrintable(bPrintable);
@@ -2499,7 +2499,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case SDRATTR_OBJVISIBLE:
{
- sal_Bool bVisible = sal_Bool();
+ bool bVisible;
if( rValue >>= bVisible )
{
mpObj->SetVisible(bVisible);
@@ -2509,7 +2509,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case SDRATTR_OBJSIZEPROTECT:
{
- sal_Bool bResizeProtect = sal_Bool();
+ bool bResizeProtect;
if( rValue >>= bResizeProtect )
{
mpObj->SetResizeProtect(bResizeProtect);
@@ -2646,7 +2646,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
case OWN_ATTR_ISFONTWORK:
{
- rValue <<= (sal_Bool)(mpObj->ISA(SdrTextObj) && ((SdrTextObj*)mpObj.get())->IsFontwork());
+ rValue <<= mpObj->ISA(SdrTextObj) && ((SdrTextObj*)mpObj.get())->IsFontwork();
break;
}
@@ -2710,7 +2710,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
case OWN_ATTR_MIRRORED:
{
- sal_Bool bMirror = sal_False;
+ bool bMirror = false;
if( mpObj.is() && mpObj->ISA(SdrGrafObj) )
bMirror = ((SdrGrafObj*)mpObj.get())->IsMirrored();
@@ -2855,7 +2855,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case SDRATTR_OBJMOVEPROTECT:
- rValue = uno::makeAny( (sal_Bool) mpObj->IsMoveProtect() );
+ rValue = uno::makeAny( mpObj->IsMoveProtect() );
break;
case SDRATTR_OBJECTNAME:
@@ -2881,15 +2881,15 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case SDRATTR_OBJPRINTABLE:
- rValue <<= static_cast<sal_Bool>( mpObj->IsPrintable() );
+ rValue <<= mpObj->IsPrintable();
break;
case SDRATTR_OBJVISIBLE:
- rValue <<= static_cast<sal_Bool>( mpObj->IsVisible() );
+ rValue <<= mpObj->IsVisible();
break;
case SDRATTR_OBJSIZEPROTECT:
- rValue <<= static_cast<sal_Bool>( mpObj->IsResizeProtect() );
+ rValue <<= mpObj->IsResizeProtect();
break;
case OWN_ATTR_PAGE_NUMBER:
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 79ab5888315d..0e385200aafc 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -97,7 +97,7 @@ private:
bool mbDestroyed;
bool mbIsLocked;
bool mbNeedsUpdate;
- sal_Bool mbOldUndoMode;
+ bool mbOldUndoMode;
bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
@@ -131,7 +131,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
SvxTextForwarder* GetTextForwarder();
- SvxEditViewForwarder* GetEditViewForwarder( sal_Bool );
+ SvxEditViewForwarder* GetEditViewForwarder( bool );
void UpdateData();
void addRange( SvxUnoTextRangeBase* pNewRange );
@@ -141,7 +141,7 @@ public:
void lock();
void unlock();
- sal_Bool IsValid() const;
+ bool IsValid() const;
Rectangle GetVisArea();
Point LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -172,7 +172,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mbDestroyed ( false ),
mbIsLocked ( false ),
mbNeedsUpdate ( false ),
- mbOldUndoMode ( sal_False ),
+ mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( false ),
mbNotificationsDisabled ( false ),
@@ -210,7 +210,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mbDestroyed ( false ),
mbIsLocked ( false ),
mbNeedsUpdate ( false ),
- mbOldUndoMode ( sal_False ),
+ mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( true ),
mbNotificationsDisabled ( false ),
@@ -785,7 +785,7 @@ SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder()
return NULL;
}
-SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate )
{
if( mbDestroyed || mpObject == NULL )
return NULL;
@@ -925,7 +925,7 @@ void SvxTextEditSourceImpl::unlock()
}
}
-sal_Bool SvxTextEditSourceImpl::IsValid() const
+bool SvxTextEditSourceImpl::IsValid() const
{
return mpView && mpWindow ? sal_True : sal_False;
}
@@ -969,7 +969,7 @@ Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& r
// but may change with every key press.
if( IsEditMode() )
{
- SvxEditViewForwarder* pForwarder = GetEditViewForwarder(sal_False);
+ SvxEditViewForwarder* pForwarder = GetEditViewForwarder(false);
if( pForwarder )
return pForwarder->LogicToPixel( rPoint, rMapMode );
@@ -1001,7 +1001,7 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r
// but may change with every key press.
if( IsEditMode() )
{
- SvxEditViewForwarder* pForwarder = GetEditViewForwarder(sal_False);
+ SvxEditViewForwarder* pForwarder = GetEditViewForwarder(false);
if( pForwarder )
return pForwarder->PixelToLogic( rPoint, rMapMode );
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index c82520590e21..1cf1af4967cd 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star;
namespace {
GalleryThemeProvider::GalleryThemeProvider() :
- mbHiddenThemes( sal_False )
+ mbHiddenThemes( false )
{
mpGallery = ::Gallery::GetGalleryInstance();
}
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName )
{
const SolarMutexGuard aGuard;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( mpGallery && mpGallery->HasTheme( rName ) )
bRet = ( mbHiddenThemes || !mpGallery->GetThemeInfo( rName )->IsHidden() );
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index b9d6e4f0fe96..3e4dd0e9a444 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -279,7 +279,7 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
nPos = aURLNoPar.indexOf( ':' );
if( -1 == nPos )
return false;
- sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE );
+ bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE );
bool bGrUrl = !bObjUrl &&
aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE );
if( !(bObjUrl || bGrUrl) )
@@ -384,7 +384,7 @@ bool SvXMLEmbeddedObjectHelper::ImplReadObject(
// Is the object name unique?
// if the object is already instantiated by GetEmbeddedObject
// that means that the duplication is being loaded
- sal_Bool bDuplicate = rContainer.HasInstantiatedEmbeddedObject( rObjName );
+ bool bDuplicate = rContainer.HasInstantiatedEmbeddedObject( rObjName );
DBG_ASSERT( !bDuplicate, "An object in the document is referenced twice!" );
if( xDocStor != xCntnrStor || pTemp || bDuplicate )
@@ -678,7 +678,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
comphelper::OStorageHelper::GetTemporaryStorage();
Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 );
aEmbDescr[0].Name = "StoreVisualReplacement";
- aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat);
+ aEmbDescr[0].Value <<= !bOasisFormat;
if ( !bOasisFormat )
{
uno::Reference< io::XInputStream > xGrInStream = ImplGetReplacementImage( xObj );
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 1fb02714c845..c642e0a376fa 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -50,7 +50,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut, const Reference< lang::XComponent >& xComponent, const char* pExportService )
{
- sal_Bool bDocRet = xOut.is();
+ bool bDocRet = xOut.is();
Reference< document::XGraphicObjectResolver > xGraphicResolver;
SvXMLGraphicHelper *pGraphicHelper = 0;
@@ -101,7 +101,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
if( !xFilter.is() )
{
OSL_FAIL( "com.sun.star.comp.Draw.XMLExporter service missing" );
- bDocRet = sal_False;
+ bDocRet = false;
}
if( bDocRet )
@@ -121,7 +121,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
catch(uno::Exception const&)
{
DBG_UNHANDLED_EXCEPTION();
- bDocRet = sal_False;
+ bDocRet = false;
}
if( pGraphicHelper )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 7e00eb37c239..8d73719b84c5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -110,7 +110,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId )
{
Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
const GfxLink aGfxLink( aGraphic.GetLink() );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( aGfxLink.GetDataSize() && aGfxLink.GetData() )
{
@@ -214,7 +214,7 @@ private:
SvStream* mpOStm;
Reference< XOutputStream > mxStmWrapper;
GraphicObject maGrfObj;
- sal_Bool mbClosed;
+ bool mbClosed;
public:
@@ -227,7 +227,7 @@ public:
SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() :
mpTmp( new ::utl::TempFile ),
- mbClosed( sal_False )
+ mbClosed( false )
{
mpTmp->EnableKillingFile();
@@ -270,7 +270,7 @@ void SAL_CALL SvXMLGraphicOutputStream::closeOutput()
mxStmWrapper->closeOutput();
mxStmWrapper.clear();
- mbClosed = sal_True;
+ mbClosed = true;
}
const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
@@ -374,7 +374,7 @@ bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStreamName )
{
OUString aURLStr( rURLStr );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( !aURLStr.isEmpty() )
{
@@ -511,7 +511,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName,
bool bUseGfxLink )
{
GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( aGrfObject.GetType() != GRAPHIC_NONE )
{
@@ -531,7 +531,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName,
xProps->setPropertyValue( "MediaType", aAny );
}
- const sal_Bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff" || aMimeType == "image/svg+xml";
+ const bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff" || aMimeType == "image/svg+xml";
aAny <<= bCompressed;
xProps->setPropertyValue( "Compressed", aAny );
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index edd9cc9d7467..b7adb4fe76b5 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -124,7 +124,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam
OUString aExt;
GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
- sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+ bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index d5b608449cfd..23dec239d7c2 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -38,7 +38,7 @@ ImpXPolygon::ImpXPolygon(sal_uInt16 nInitSize, sal_uInt16 _nResize)
: pPointAry(NULL)
, pFlagAry(NULL)
, pOldPointAry(NULL)
- , bDeleteOldPoints(sal_False)
+ , bDeleteOldPoints(false)
, nSize(0)
, nResize(_nResize)
, nPoints(0)
@@ -51,7 +51,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
: pPointAry(NULL)
, pFlagAry(NULL)
, pOldPointAry(NULL)
- , bDeleteOldPoints(sal_False)
+ , bDeleteOldPoints(false)
, nSize(0)
, nResize(rImpXPoly.nResize)
, nPoints(0)
@@ -91,7 +91,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
* errors with XPoly[n] = XPoly[0] where a resize might
* destroy the right side point array too early.
*/
-void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, bool bDeletePoints )
{
if( nNewSize == nSize )
return;
@@ -136,7 +136,7 @@ void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
nPoints = nSize;
}
if ( bDeletePoints ) delete[] (char*) pOldPointAry;
- else bDeleteOldPoints = sal_True;
+ else bDeleteOldPoints = true;
delete[] pOldFlagAry;
}
}
@@ -286,7 +286,7 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
sal_uInt16 nPos = 0;
- sal_Bool bLoopEnd = sal_False;
+ bool bLoopEnd = false;
do
{
@@ -447,7 +447,7 @@ Point& XPolygon::operator[]( sal_uInt16 nPos )
if( nPos >= pImpXPolygon->nSize )
{
DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
- pImpXPolygon->Resize(nPos + 1, sal_False);
+ pImpXPolygon->Resize(nPos + 1, false);
}
if( nPos >= pImpXPolygon->nPoints )
pImpXPolygon->nPoints = nPos + 1;