[Libreoffice-commits] core.git: dbaccess/source forms/source include/toolkit svtools/source svx/source toolkit/source
Stephan Bergmann
sbergman at redhat.com
Mon Feb 24 02:14:10 PST 2014
dbaccess/source/ui/uno/ColumnControl.cxx | 4
forms/source/richtext/richtextcontrol.cxx | 6
forms/source/richtext/richtextcontrol.hxx | 2
forms/source/solar/component/navbarcontrol.cxx | 4
include/toolkit/awt/vclxdevice.hxx | 2
include/toolkit/awt/vclxfont.hxx | 2
include/toolkit/awt/vclxmenu.hxx | 4
include/toolkit/awt/vclxprinter.hxx | 2
include/toolkit/awt/vclxwindow.hxx | 4
include/toolkit/awt/vclxwindows.hxx | 4
include/toolkit/controls/controlmodelcontainerbase.hxx | 4
include/toolkit/controls/eventcontainer.hxx | 2
include/toolkit/controls/geometrycontrolmodel.hxx | 2
include/toolkit/controls/roadmapentry.hxx | 4
include/toolkit/controls/stdtabcontroller.hxx | 4
include/toolkit/controls/stdtabcontrollermodel.hxx | 4
include/toolkit/controls/unocontrol.hxx | 22 +-
include/toolkit/controls/unocontrolbase.hxx | 10 -
include/toolkit/controls/unocontrolmodel.hxx | 2
include/toolkit/controls/unocontrols.hxx | 11 -
include/toolkit/helper/property.hxx | 4
include/toolkit/helper/unopropertyarrayhelper.hxx | 2
include/toolkit/helper/unowrapper.hxx | 4
include/toolkit/helper/vclunohelper.hxx | 2
svtools/source/uno/unoiface.cxx | 4
svx/source/fmcomp/fmgridif.cxx | 6
toolkit/source/awt/animatedimagespeer.cxx | 2
toolkit/source/awt/vclxcontainer.cxx | 4
toolkit/source/awt/vclxdevice.cxx | 2
toolkit/source/awt/vclxfont.cxx | 2
toolkit/source/awt/vclxmenu.cxx | 30 +--
toolkit/source/awt/vclxprinter.cxx | 12 -
toolkit/source/awt/vclxspinbutton.cxx | 4
toolkit/source/awt/vclxtoolkit.cxx | 6
toolkit/source/awt/vclxwindow.cxx | 78 +++----
toolkit/source/awt/vclxwindow1.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 162 ++++++++--------
toolkit/source/controls/animatedimages.cxx | 4
toolkit/source/controls/controlmodelcontainerbase.cxx | 28 +-
toolkit/source/controls/dialogcontrol.cxx | 36 +--
toolkit/source/controls/eventcontainer.cxx | 4
toolkit/source/controls/formattedcontrol.cxx | 8
toolkit/source/controls/geometrycontrolmodel.cxx | 2
toolkit/source/controls/grid/gridcolumn.cxx | 2
toolkit/source/controls/grid/gridcolumn.hxx | 2
toolkit/source/controls/grid/gridcontrol.cxx | 4
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 12 -
toolkit/source/controls/roadmapcontrol.cxx | 14 -
toolkit/source/controls/roadmapentry.cxx | 2
toolkit/source/controls/stdtabcontroller.cxx | 20 +-
toolkit/source/controls/stdtabcontrollermodel.cxx | 10 -
toolkit/source/controls/tkscrollbar.cxx | 22 +-
toolkit/source/controls/tkspinbutton.cxx | 20 +-
toolkit/source/controls/tree/treedatamodel.cxx | 8
toolkit/source/controls/unocontrol.cxx | 70 +++----
toolkit/source/controls/unocontrolbase.cxx | 24 +-
toolkit/source/controls/unocontrolcontainer.cxx | 8
toolkit/source/controls/unocontrolmodel.cxx | 28 +-
toolkit/source/controls/unocontrols.cxx | 168 ++++++++---------
toolkit/source/helper/formpdfexport.cxx | 2
toolkit/source/helper/property.cxx | 18 -
toolkit/source/helper/unopropertyarrayhelper.cxx | 4
toolkit/source/helper/unowrapper.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 2
64 files changed, 475 insertions(+), 474 deletions(-)
New commits:
commit 146c7c5c89d9ce26c3de951ff049d36df1b5857b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 24 11:13:09 2014 +0100
toolkit: sal_Bool -> bool
Change-Id: I5153c4413004d1b50cc503b3e70657bc831a5793
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 9f1da55..02e13a6 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -62,7 +62,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
::osl::ClearableMutexGuard aGuard( GetMutex() );
if ( !getPeer().is() )
{
- mbCreatingPeer = sal_True;
+ mbCreatingPeer = true;
Window* pParentWin = NULL;
if (rParentPeer.is())
@@ -128,7 +128,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY );
xPeerView->setGraphics( xGraphics );
- mbCreatingPeer = sal_False;
+ mbCreatingPeer = false;
}
}
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 9a942ea..c238cd6 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -198,7 +198,7 @@ namespace frm
if (!getPeer().is())
{
- mbCreatingPeer = sal_True;
+ mbCreatingPeer = true;
// determine the VLC window for the parent
Window* pParentWin = NULL;
@@ -242,7 +242,7 @@ namespace frm
peerCreated();
}
- mbCreatingPeer = sal_False;
+ mbCreatingPeer = false;
OControl::initFormControlPeer( getPeer() );
}
@@ -295,7 +295,7 @@ namespace frm
}
- sal_Bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
+ bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
{
return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT );
}
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index fb1a1f6..6476d23 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -80,7 +80,7 @@ namespace frm
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException);
// UnoControl
- virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const;
+ virtual bool requiresNewPeer( const OUString& _rPropertyName ) const;
};
//==================================================================
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 93e7ddb..c07ede6 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -130,7 +130,7 @@ namespace frm
if (!getPeer().is())
{
- mbCreatingPeer = sal_True;
+ mbCreatingPeer = true;
// determine the VLC window for the parent
Window* pParentWin = NULL;
@@ -171,7 +171,7 @@ namespace frm
peerCreated();
- mbCreatingPeer = sal_False;
+ mbCreatingPeer = false;
OControl::initFormControlPeer( getPeer() );
}
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 7945c67..42813da 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -64,7 +64,7 @@ public:
void SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; }
OutputDevice* GetOutputDevice() const { return mpOutputDevice; }
- void SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit );
+ void SetCreatedWithToolkit( bool bCreatedWithToolkit );
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 679c61f..0129612 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -45,7 +45,7 @@ private:
FontMetric* mpFontMetric;
protected:
- sal_Bool ImplAssertValidFontMetric();
+ bool ImplAssertValidFontMetric();
::osl::Mutex& GetMutex() { return maMutex; }
public:
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 050c31a..ec9f975 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -67,7 +67,7 @@ protected:
DECL_LINK( MenuEventListener, VclSimpleEvent* );
- void ImplCreateMenu( sal_Bool bPopup );
+ void ImplCreateMenu( bool bPopup );
public:
VCLXMenu();
@@ -76,7 +76,7 @@ public:
Menu* GetMenu() const { return mpMenu; }
- sal_Bool IsPopupMenu() const;
+ bool IsPopupMenu() const;
// css::uno::XInterface
css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException);
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 0efd22a..70c0748 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -60,7 +60,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxPrnDevice;
sal_Int16 mnOrientation;
- sal_Bool mbHorizontal;
+ bool mbHorizontal;
public:
VCLXPrinterPropertySet( const OUString& rPrinterName );
virtual ~VCLXPrinterPropertySet();
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index c28bfbb..5532ff7 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -90,8 +90,8 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
CreateAccessibleContext();
- void SetSynthesizingVCLEvent( sal_Bool b );
- sal_Bool IsSynthesizingVCLEvent() const;
+ void SetSynthesizingVCLEvent( bool b );
+ bool IsSynthesizingVCLEvent() const;
void SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle );
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 97e2786..ce11950 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -944,8 +944,8 @@ public:
void SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; }
- void setStrictFormat( sal_Bool bStrict );
- sal_Bool isStrictFormat();
+ void setStrictFormat( bool bStrict );
+ bool isStrictFormat();
// ::com::sun::star::awt::VclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index ed4eddb..3204861 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -82,9 +82,9 @@ protected:
UnoControlModelHolderList maModels;
AllGroups maGroups;
- sal_Bool mbGroupsUpToDate;
+ bool mbGroupsUpToDate;
- sal_Bool m_bEnabled;
+ bool m_bEnabled;
OUString m_sImageURL;
OUString m_sTooltip;
sal_Int16 m_nTabPageId;
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 800ccdf..f036e48 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -44,7 +44,7 @@ struct hashName_Impl
struct eqName_Impl
{
- sal_Bool operator()(const OUString Str1, const OUString Str2) const
+ bool operator()(const OUString Str1, const OUString Str2) const
{
return ( Str1 == Str2 );
}
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index e6b7bfe..b093ee5 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -80,7 +80,7 @@ namespace com { namespace sun { namespace star {
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver;
// </properties>
- sal_Bool m_bCloneable;
+ bool m_bCloneable;
protected:
virtual ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const;
diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index da66948..5e1968a 100644
--- a/include/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.hxx
@@ -72,8 +72,8 @@ protected:
// <properties>
OUString m_sLabel;
sal_Int32 m_nID;
- sal_Bool m_bEnabled;
- sal_Bool m_bInteractive;
+ bool m_bEnabled;
+ bool m_bInteractive;
// </properties>
};
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index 9c790c9..b241618 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -44,9 +44,9 @@ private:
protected:
::osl::Mutex& GetMutex() { return maMutex; }
- sal_Bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, sal_Bool bPeerComponent ) const;
+ bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ) const;
// if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls
- void ImplActivateControl( sal_Bool bFirst ) const;
+ void ImplActivateControl( bool bFirst ) const;
public:
StdTabController();
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index dc34e43..6700cd2 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -61,7 +61,7 @@ public:
struct UnoControlModelEntry
{
- sal_Bool bGroup;
+ bool bGroup;
union
{
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >* pxControl;
@@ -88,7 +88,7 @@ class StdTabControllerModel : public ::com::sun::star::awt::XTabControllerMode
private:
::osl::Mutex maMutex;
UnoControlModelEntryList maControls;
- sal_Bool mbGroupControl;
+ bool mbGroupControl;
protected:
::osl::Mutex& GetMutex() { return maMutex; }
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index d32ba99..baccf57 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -45,16 +45,16 @@
struct UnoControlComponentInfos
{
- sal_Bool bVisible;
- sal_Bool bEnable;
+ bool bVisible;
+ bool bEnable;
long nX, nY, nWidth, nHeight;
sal_uInt16 nFlags;
float nZoomX, nZoomY;
UnoControlComponentInfos()
{
- bVisible = sal_True;
- bEnable = sal_True;
+ bVisible = true;
+ bEnable = true;
nX = nY = nWidth = nHeight = 0;
nFlags = 0; // POSSIZE_POSSIZE;
nZoomX = nZoomY = 1.0f;
@@ -101,11 +101,11 @@ protected:
::com::sun::star::uno::WeakReferenceHelper
maAccessibleContext; /// our most recent XAccessibleContext instance
- sal_Bool mbDisposePeer;
- sal_Bool mbRefeshingPeer;
- sal_Bool mbCreatingPeer;
- sal_Bool mbCreatingCompatiblePeer;
- sal_Bool mbDesignMode;
+ bool mbDisposePeer;
+ bool mbRefeshingPeer;
+ bool mbCreatingPeer;
+ bool mbCreatingCompatiblePeer;
+ bool mbDesignMode;
UnoControlComponentInfos maComponentInfos;
UnoControl_Data* mpData;
@@ -116,7 +116,7 @@ protected:
virtual void updateFromModel();
void peerCreated();
bool ImplCheckLocalize( OUString& _rPossiblyLocalizable );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer );
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer );
virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents );
@@ -133,7 +133,7 @@ protected:
mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing
}
- virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const;
+ virtual bool requiresNewPeer( const OUString& _rPropertyName ) const;
public:
UnoControl();
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index c097ffc..124671e 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -35,15 +35,15 @@ class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
protected:
UnoControlBase() :UnoControl() {}
- sal_Bool ImplHasProperty( sal_uInt16 nProp );
- sal_Bool ImplHasProperty( const OUString& aPropertyName );
- void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis );
- void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis );
+ bool ImplHasProperty( sal_uInt16 nProp );
+ bool ImplHasProperty( const OUString& aPropertyName );
+ void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, bool bUpdateThis );
+ void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, bool bUpdateThis );
::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName );
template <typename T> T ImplGetPropertyValuePOD( sal_uInt16 nProp );
template <typename T> T ImplGetPropertyValueClass( sal_uInt16 nProp );
- sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp );
+ bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp );
sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp );
sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp );
double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp );
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 1495db0..555f545 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -75,7 +75,7 @@ protected:
void ImplRegisterProperty( sal_uInt16 nPropId, const ::com::sun::star::uno::Any& rDefault );
::com::sun::star::uno::Sequence<sal_Int32> ImplGetPropertyIds() const;
virtual ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
- sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const;
+ bool ImplHasProperty( sal_uInt16 nPropId ) const;
/** called before setting multiple properties, allows to care for property dependencies
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 71f3e76..85bc0fd 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -48,6 +48,7 @@
#include <toolkit/helper/macros.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <vcl/bitmapex.hxx>
+#include <vcl/settings.hxx>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -121,9 +122,9 @@ private:
OUString maText;
sal_uInt16 mnMaxTextLen;
- sal_Bool mbSetTextInPeer;
- sal_Bool mbSetMaxTextLenInPeer;
- sal_Bool mbHasTextProperty;
+ bool mbSetTextInPeer;
+ bool mbSetMaxTextLenInPeer;
+ bool mbHasTextProperty;
public:
@@ -1016,7 +1017,7 @@ class UnoSpinFieldControl : public UnoEditControl,
{
private:
SpinListenerMultiplexer maSpinListeners;
- sal_Bool mbRepeat;
+ bool mbRepeat;
public:
UnoSpinFieldControl();
@@ -1082,7 +1083,7 @@ class UnoDateFieldControl : public UnoSpinFieldControl,
private:
::com::sun::star::util::Date mnFirst;
::com::sun::star::util::Date mnLast;
- sal_Bool mbLongFormat;
+ AutoState mbLongFormat;
public:
UnoDateFieldControl();
OUString GetComponentServiceName();
diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx
index c9feef4..453cf34 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -242,8 +242,8 @@ const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId );
TOOLKIT_DLLPUBLIC const OUString& GetPropertyName( sal_uInt16 nPropertyId );
sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId );
sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId );
-sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId );
-sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 );
+bool DoesDependOnOthers( sal_uInt16 nPropertyId );
+bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 );
diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx
index 172c21d..ac36b3b 100644
--- a/include/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/include/toolkit/helper/unopropertyarrayhelper.hxx
@@ -35,7 +35,7 @@ private:
std::set<sal_Int32> maIDs;
protected:
- sal_Bool ImplHasProperty( sal_uInt16 nPropId ) const;
+ bool ImplHasProperty( sal_uInt16 nPropId ) const;
public:
UnoPropertyArrayHelper( const ::com::sun::star::uno::Sequence<sal_Int32>& rIDs );
diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx
index cbae08c..95a9c1a 100644
--- a/include/toolkit/helper/unowrapper.hxx
+++ b/include/toolkit/helper/unowrapper.hxx
@@ -58,11 +58,11 @@ public:
void WindowDestroyed( Window* pWindow );
void WindowEvent_Move( Window* pWindow );
void WindowEvent_Resize( Window* pWindow );
- void WindowEvent_Show( Window* pWindow, sal_Bool bShow );
+ void WindowEvent_Show( Window* pWindow, bool bShow );
void WindowEvent_Close( Window* pWindow );
void WindowEvent_Minimize( Window* pWindow );
void WindowEvent_Normalize( Window* pWindow );
- void WindowEvent_Activate( Window* pWindow, sal_Bool bActivated );
+ void WindowEvent_Activate( Window* pWindow, bool bActivated );
void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt );
void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt );
void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt );
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index a6467b8..444c044 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -108,7 +108,7 @@ public:
static FontWeight ConvertFontWeight( float f );
// Rectangle
- static sal_Bool IsZero( ::com::sun::star::awt::Rectangle rRect );
+ static bool IsZero( ::com::sun::star::awt::Rectangle rRect );
static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( Window* pWindow );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 597e43a..1ecfdef 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -220,10 +220,10 @@ void VCLXMultiLineEdit::setText( const OUString& aText ) throw(::com::sun::star:
pEdit->SetText( aText );
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index f50c77f4..bc6df98 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -506,7 +506,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
if (!getPeer().is())
{
- mbCreatingPeer = sal_True;
+ mbCreatingPeer = true;
// mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method
// to prevent recursion.
@@ -642,7 +642,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY );
xPeerView->setGraphics( mxGraphics );
}
- mbCreatingPeer = sal_False;
+ mbCreatingPeer = false;
}
}
@@ -752,7 +752,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
Reference< XRowSetSupplier > xGrid(getPeer(), UNO_QUERY);
- if (xGrid.is() && (bOn != mbDesignMode || (!bOn && !xGrid->getRowSet().is())))
+ if (xGrid.is() && (bool(bOn) != mbDesignMode || (!bOn && !xGrid->getRowSet().is())))
{
if (bOn)
{
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 362719e..9579d8c 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -359,7 +359,7 @@ namespace toolkit
}
case BASEPROPERTY_AUTO_REPEAT:
{
- sal_Bool bRepeat( sal_True );
+ bool bRepeat( true );
if ( i_value >>= bRepeat )
pThrobber->setRepeat( bRepeat );
break;
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index fcc4e88..782bea9 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -148,7 +148,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s
nStyle &= ~(WB_TABSTOP|WB_NOTABSTOP|WB_GROUP);
if ( pTabs[n].getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN )
{
- sal_Bool bTab = false;
+ bool bTab = false;
pTabs[n] >>= bTab;
nStyle |= ( bTab ? WB_TABSTOP : WB_NOTABSTOP );
}
@@ -183,7 +183,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun:
{
Window* pSortBehind = pPrevWin;
// #57096# Sort all radios consecutively
- sal_Bool bNewPrevWin = sal_True;
+ bool bNewPrevWin = true;
if ( pWin->GetType() == WINDOW_RADIOBUTTON )
{
if ( pPrevRadio )
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 75e6ecc..cf4aa02 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -57,7 +57,7 @@ void VCLXDevice::DestroyOutputDevice()
mpOutputDevice = NULL;
}
-void VCLXDevice::SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit )
+void VCLXDevice::SetCreatedWithToolkit( bool bCreatedWithToolkit )
{
if ( bCreatedWithToolkit )
nFlags |= FLAGS_CREATEDWITHTOOLKIT;
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index a2bce61..1f79313 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -51,7 +51,7 @@ void VCLXFont::Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont )
maFont = rFont;
}
-sal_Bool VCLXFont::ImplAssertValidFontMetric()
+bool VCLXFont::ImplAssertValidFontMetric()
{
if ( !mpFontMetric && mxDevice.is() )
{
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 3858625..58c9278 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -65,12 +65,12 @@ VCLXMenu::~VCLXMenu()
}
}
-sal_Bool VCLXMenu::IsPopupMenu() const
+bool VCLXMenu::IsPopupMenu() const
{
return (mpMenu && ! mpMenu->IsMenuBar());
}
-void VCLXMenu::ImplCreateMenu( sal_Bool bPopup )
+void VCLXMenu::ImplCreateMenu( bool bPopup )
{
DBG_ASSERT( !mpMenu, "CreateMenu: Menu exists!" );
@@ -172,7 +172,7 @@ OUString SAL_CALL VCLXMenu::getImplementationName( )
throw (css::uno::RuntimeException)
{
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const sal_Bool bIsPopupMenu = IsPopupMenu();
+ const bool bIsPopupMenu = IsPopupMenu();
aGuard.clear();
OUString implName( "stardiv.Toolkit." );
@@ -188,7 +188,7 @@ css::uno::Sequence< OUString > SAL_CALL VCLXMenu::getSupportedServiceNames( )
throw (css::uno::RuntimeException)
{
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const sal_Bool bIsPopupMenu = IsPopupMenu();
+ const bool bIsPopupMenu = IsPopupMenu();
aGuard.clear();
css::uno::Sequence< OUString > aNames( 1 );
@@ -211,7 +211,7 @@ css::uno::Any VCLXMenu::queryInterface(
throw(css::uno::RuntimeException)
{
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const sal_Bool bIsPopupMenu = IsPopupMenu();
+ const bool bIsPopupMenu = IsPopupMenu();
aGuard.clear();
css::uno::Any aRet;
@@ -241,7 +241,7 @@ css::uno::Sequence< css::uno::Type > VCLXMenu::getTypes()
throw(css::uno::RuntimeException)
{
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const sal_Bool bIsPopupMenu = IsPopupMenu();
+ const bool bIsPopupMenu = IsPopupMenu();
aGuard.clear();
static ::cppu::OTypeCollection* pCollectionMenuBar = NULL;
@@ -289,7 +289,7 @@ css::uno::Sequence< sal_Int8 > VCLXMenu::getImplementationId()
throw(css::uno::RuntimeException)
{
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const sal_Bool bIsPopupMenu = IsPopupMenu();
+ const bool bIsPopupMenu = IsPopupMenu();
aGuard.clear();
static ::cppu::OImplementationId* pIdMenuBar = NULL;
@@ -636,7 +636,7 @@ namespace
{
static Image lcl_XGraphic2VCLImage(
const css::uno::Reference< css::graphic::XGraphic >& xGraphic,
- sal_Bool bResize )
+ bool bResize )
{
Image aImage;
if ( !xGraphic.is() )
@@ -657,7 +657,7 @@ namespace
::Size aNewSize( nIdealWidth, nIdealHeight );
- sal_Bool bModified( sal_False );
+ bool bModified( false );
BitmapEx aBitmapEx = aImage.GetBitmapEx();
bModified = aBitmapEx.Scale( aNewSize, BMP_SCALE_BESTQUALITY );
@@ -690,10 +690,10 @@ namespace
KeyCode lcl_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
- sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
- sal_Bool bMod1 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 );
- sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 );
- sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 );
+ bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
+ bool bMod1 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 );
+ bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 );
+ bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 );
sal_uInt16 nKey = (sal_uInt16)aAWTKey.KeyCode;
return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
@@ -931,7 +931,7 @@ DBG_NAME(VCLXMenuBar);
VCLXMenuBar::VCLXMenuBar()
{
DBG_CTOR( VCLXMenuBar, 0 );
- ImplCreateMenu( sal_False );
+ ImplCreateMenu( false );
}
VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar )
@@ -952,7 +952,7 @@ DBG_NAME(VCLXPopupMenu);
VCLXPopupMenu::VCLXPopupMenu()
{
DBG_CTOR( VCLXPopupMenu, 0 );
- ImplCreateMenu( sal_True );
+ ImplCreateMenu( true );
}
VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 7c5a627..427450a 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -74,7 +74,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const OUString& rPrinterName )
SolarMutexGuard aSolarGuard;
mnOrientation = 0;
- mbHorizontal = sal_False;
+ mbHorizontal = false;
}
VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
@@ -120,7 +120,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno
{
::osl::MutexGuard aGuard( Mutex );
- sal_Bool bDifferent = sal_False;
+ bool bDifferent = false;
switch ( nHandle )
{
case PROPERTY_Orientation:
@@ -130,18 +130,18 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno
{
rConvertedValue <<= n;
rOldValue <<= mnOrientation;
- bDifferent = sal_True;
+ bDifferent = true;
}
}
break;
case PROPERTY_Horizontal:
{
- sal_Bool b;
+ bool b;
if( ( rValue >>= b ) && ( b != mbHorizontal ) )
{
rConvertedValue <<= b;
rOldValue <<= mbHorizontal;
- bDifferent = sal_True;
+ bDifferent = true;
}
}
break;
@@ -278,7 +278,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/
{
::osl::MutexGuard aGuard( Mutex );
- sal_Bool bDone = sal_True;
+ bool bDone = true;
if ( mpPrinter.get() )
{
maInitJobSetup = mpPrinter->GetJobSetup();
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 7215dec..3c3f0d4 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -45,7 +45,7 @@ namespace toolkit
namespace
{
- void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, sal_Bool _bShouldBePresent )
+ void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, bool _bShouldBePresent )
{
WinBits nStyle = _pWindow->GetStyle();
if ( _bShouldBePresent )
@@ -247,7 +247,7 @@ namespace toolkit
SolarMutexGuard aGuard;
sal_Int32 nValue = 0;
- sal_Bool bIsLongValue = ( Value >>= nValue );
+ bool bIsLongValue = ( Value >>= nValue );
if ( GetWindow() )
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 8c5be7d..d17a8ef 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1093,7 +1093,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// use sal_Int64 here to accommodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nWindowHandle = 0;
- sal_Bool bXEmbed = sal_False;
+ bool bXEmbed = false;
bool bUseParentData = true;
if( ! (anyHandle >>= nWindowHandle) )
@@ -1286,7 +1286,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
}
else
{
- pNewComp->SetCreatedWithToolkit( sal_True );
+ pNewComp->SetCreatedWithToolkit( true );
xRef = pNewComp;
pNewWindow->SetComponentInterface( xRef );
}
@@ -1328,7 +1328,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
// use sal_Int64 here to accommodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nWindowHandle = 0;
- sal_Bool bXEmbed = sal_False;
+ bool bXEmbed = false;
bool bUseParentData = true;
if( ! (Parent >>= nWindowHandle) )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 66ed80c..6fdedf9 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -94,8 +94,8 @@ private:
::toolkit::AccessibilityClient maAccFactory;
bool mbDisposed;
bool mbDrawingOntoParent; // no bit mask, is passed around by reference
- sal_Bool mbEnableVisible;
- sal_Bool mbDirectVisible;
+ bool mbEnableVisible;
+ bool mbDirectVisible;
::osl::Mutex maListenerContainerMutex;
::cppu::OInterfaceContainerHelper maWindow2Listeners;
@@ -147,12 +147,12 @@ public:
/** synchronously mbEnableVisible
*/
- void setEnableVisible( sal_Bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
- sal_Bool isEnableVisible() { return mbEnableVisible; }
+ void setEnableVisible( bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
+ bool isEnableVisible() { return mbEnableVisible; }
/** synchronously mbDirectVisible;
*/
- void setDirectVisible( sal_Bool bDirectVisible ) { mbDirectVisible = bDirectVisible; }
- sal_Bool isDirectVisible() { return mbDirectVisible; }
+ void setDirectVisible( bool bDirectVisible ) { mbDirectVisible = bDirectVisible; }
+ bool isDirectVisible() { return mbDirectVisible; }
/** impl-version of VCLXWindow::ImplExecuteAsyncWithoutSolarLock
*/
@@ -203,8 +203,8 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps
:mrAntiImpl( _rAntiImpl )
,mbDisposed( false )
,mbDrawingOntoParent( false )
- ,mbEnableVisible(sal_True)
- ,mbDirectVisible(sal_True)
+ ,mbEnableVisible(true)
+ ,mbDirectVisible(true)
,maListenerContainerMutex( )
,maWindow2Listeners( maListenerContainerMutex )
,maDockableWindowListeners( maListenerContainerMutex )
@@ -408,7 +408,7 @@ void VCLXWindow::SetWindow( Window* pWindow )
if ( GetWindow() )
{
GetWindow()->AddEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
- sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
+ bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
mpImpl->setDirectVisible( bDirectVisible );
}
}
@@ -907,12 +907,12 @@ uno::Reference< accessibility::XAccessibleContext > VCLXWindow::CreateAccessible
return getAccessibleFactory().createAccessibleContext( this );
}
-void VCLXWindow::SetSynthesizingVCLEvent( sal_Bool _b )
+void VCLXWindow::SetSynthesizingVCLEvent( bool _b )
{
mpImpl->mbSynthesizingVCLEvent = _b;
}
-sal_Bool VCLXWindow::IsSynthesizingVCLEvent() const
+bool VCLXWindow::IsSynthesizingVCLEvent() const
{
return mpImpl->mbSynthesizingVCLEvent;
}
@@ -1202,7 +1202,7 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun
{
SolarMutexGuard aGuard;
- sal_Bool bIsChild = sal_False;
+ bool bIsChild = false;
Window* pWindow = GetWindow();
if ( pWindow )
{
@@ -1374,11 +1374,11 @@ namespace
{
void lcl_updateWritingMode( Window& _rWindow, const sal_Int16 _nWritingMode, const sal_Int16 _nContextWritingMode )
{
- sal_Bool bEnableRTL = sal_False;
+ bool bEnableRTL = false;
switch ( _nWritingMode )
{
- case WritingMode2::LR_TB: bEnableRTL = sal_False; break;
- case WritingMode2::RL_TB: bEnableRTL = sal_True; break;
+ case WritingMode2::LR_TB: bEnableRTL = false; break;
+ case WritingMode2::RL_TB: bEnableRTL = true; break;
case WritingMode2::CONTEXT:
{
// consult our ContextWritingMode. If it has an explicit RTL/LTR value, then use
@@ -1386,8 +1386,8 @@ namespace
// own window for its RTL mode
switch ( _nContextWritingMode )
{
- case WritingMode2::LR_TB: bEnableRTL = sal_False; break;
- case WritingMode2::RL_TB: bEnableRTL = sal_True; break;
+ case WritingMode2::LR_TB: bEnableRTL = false; break;
+ case WritingMode2::RL_TB: bEnableRTL = true; break;
case WritingMode2::CONTEXT:
{
const Window* pParent = _rWindow.GetParent();
@@ -1417,7 +1417,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
if ( !pWindow )
return;
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
WindowType eWinType = pWindow->GetType();
sal_uInt16 nPropType = GetPropertyId( PropertyName );
@@ -1445,7 +1445,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
case BASEPROPERTY_WRITING_MODE:
{
- sal_Bool bProperType = ( Value >>= mpImpl->mnWritingMode );
+ bool bProperType = ( Value >>= mpImpl->mnWritingMode );
OSL_ENSURE( bProperType, "VCLXWindow::setProperty( 'WritingMode' ): illegal value type!" );
if ( bProperType )
lcl_updateWritingMode( *pWindow, mpImpl->mnWritingMode, mpImpl->mnContextWritingMode );
@@ -1478,7 +1478,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
case BASEPROPERTY_NATIVE_WIDGET_LOOK:
{
- sal_Bool bEnable( sal_True );
+ bool bEnable( true );
OSL_VERIFY( Value >>= bEnable );
pWindow->EnableNativeWidget( bEnable );
}
@@ -1493,14 +1493,14 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
case BASEPROPERTY_ENABLED:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
setEnable( b );
}
break;
case BASEPROPERTY_ENABLEVISIBLE:
{
- sal_Bool b = sal_False;
+ bool b = false;
if ( Value >>= b )
{
if( b != mpImpl->isEnableVisible() )
@@ -1745,7 +1745,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
WinBits nStyle = pWindow->GetStyle() & ~WB_TABSTOP;
if ( !bVoid )
{
- sal_Bool bTab = false;
+ bool bTab = false;
Value >>= bTab;
if ( bTab )
nStyle |= WB_TABSTOP;
@@ -1827,7 +1827,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
)
{
WinBits nStyle = pWindow->GetStyle();
- sal_Bool bMulti = false;
+ bool bMulti = false;
Value >>= bMulti;
if ( bMulti )
nStyle |= WB_WORDBREAK;
@@ -1876,14 +1876,14 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
break;
case BASEPROPERTY_MOUSETRANSPARENT:
{
- sal_Bool bMouseTransparent = false;
+ bool bMouseTransparent = false;
Value >>= bMouseTransparent;
pWindow->SetMouseTransparent( bMouseTransparent );
}
break;
case BASEPROPERTY_PAINTTRANSPARENT:
{
- sal_Bool bPaintTransparent = false;
+ bool bPaintTransparent = false;
Value >>= bPaintTransparent;
pWindow->SetPaintTransparent( bPaintTransparent );
// pWindow->SetBackground();
@@ -1892,7 +1892,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
case BASEPROPERTY_REPEAT:
{
- sal_Bool bRepeat( sal_False );
+ bool bRepeat( false );
Value >>= bRepeat;
WinBits nStyle = pWindow->GetStyle();
@@ -1985,19 +1985,19 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
break;
case BASEPROPERTY_NATIVE_WIDGET_LOOK:
- aProp <<= (sal_Bool) GetWindow()->IsNativeWidgetEnabled();
+ aProp <<= GetWindow()->IsNativeWidgetEnabled();
break;
case BASEPROPERTY_ENABLED:
- aProp <<= (sal_Bool) GetWindow()->IsEnabled();
+ aProp <<= GetWindow()->IsEnabled();
break;
case BASEPROPERTY_ENABLEVISIBLE:
- aProp <<= (sal_Bool) mpImpl->isEnableVisible();
+ aProp <<= mpImpl->isEnableVisible();
break;
case BASEPROPERTY_HIGHCONTRASTMODE:
- aProp <<= (sal_Bool) GetWindow()->GetSettings().GetStyleSettings().GetHighContrastMode();
+ aProp <<= GetWindow()->GetSettings().GetStyleSettings().GetHighContrastMode();
break;
case BASEPROPERTY_TEXT:
@@ -2066,7 +2066,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
}
break;
case BASEPROPERTY_TABSTOP:
- aProp <<= (sal_Bool) ( GetWindow()->GetStyle() & WB_TABSTOP ) ? sal_True : sal_False;
+ aProp <<= ( GetWindow()->GetStyle() & WB_TABSTOP ) != 0;
break;
case BASEPROPERTY_VERTICALALIGN:
{
@@ -2118,30 +2118,30 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
|| ( eWinType == WINDOW_CANCELBUTTON )
|| ( eWinType == WINDOW_HELPBUTTON )
)
- aProp <<= (sal_Bool) ( GetWindow()->GetStyle() & WB_WORDBREAK ) ? sal_True : sal_False;
+ aProp <<= ( GetWindow()->GetStyle() & WB_WORDBREAK ) != 0;
}
break;
case BASEPROPERTY_AUTOMNEMONICS:
{
- sal_Bool bAutoMnemonics = GetWindow()->GetSettings().GetStyleSettings().GetAutoMnemonic();
+ bool bAutoMnemonics = GetWindow()->GetSettings().GetStyleSettings().GetAutoMnemonic();
aProp <<= bAutoMnemonics;
}
break;
case BASEPROPERTY_MOUSETRANSPARENT:
{
- sal_Bool bMouseTransparent = GetWindow()->IsMouseTransparent();
+ bool bMouseTransparent = GetWindow()->IsMouseTransparent();
aProp <<= bMouseTransparent;
}
break;
case BASEPROPERTY_PAINTTRANSPARENT:
{
- sal_Bool bPaintTransparent = GetWindow()->IsPaintTransparent();
+ bool bPaintTransparent = GetWindow()->IsPaintTransparent();
aProp <<= bPaintTransparent;
}
break;
case BASEPROPERTY_REPEAT:
- aProp <<= (sal_Bool)( 0 != ( GetWindow()->GetStyle() & WB_REPEAT ) );
+ aProp <<= ( 0 != ( GetWindow()->GetStyle() & WB_REPEAT ) );
break;
case BASEPROPERTY_REPEAT_DELAY:
@@ -2295,7 +2295,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
{
::comphelper::FlagGuard aDrawingflagGuard( mpImpl->getDrawingOntoParent_ref() );
- sal_Bool bWasVisible = pWindow->IsVisible();
+ bool bWasVisible = pWindow->IsVisible();
Point aOldPos( pWindow->GetPosPixel() );
if ( bWasVisible && aOldPos == aPos )
@@ -2339,7 +2339,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
}
else
{
- sal_Bool bOldNW =pWindow->IsNativeWidgetEnabled();
+ bool bOldNW =pWindow->IsNativeWidgetEnabled();
if( bOldNW )
pWindow->EnableNativeWidget(false);
pWindow->PaintToDevice( pDev, aP, aSz );
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 3869c97..53ecc7d 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -48,7 +48,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
// use sal_Int64 here to accommodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nHandle = 0;
- sal_Bool bXEmbed = sal_False;
+ bool bXEmbed = false;
bool bThrow = false;
if( ! (rHandle >>= nHandle) )
{
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index f7cefe6..57a4b0b 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -154,10 +154,10 @@ namespace toolkit
return makeAny( nBackgroundColor );
}
- static void adjustBooleanWindowStyle( const Any& _rValue, Window* _pWindow, WinBits _nBits, sal_Bool _bInverseSemantics )
+ static void adjustBooleanWindowStyle( const Any& _rValue, Window* _pWindow, WinBits _nBits, bool _bInverseSemantics )
{
WinBits nStyle = _pWindow->GetStyle();
- sal_Bool bValue( sal_False );
+ bool bValue( false );
OSL_VERIFY( _rValue >>= bValue );
if ( bValue != _bInverseSemantics )
nStyle |= _nBits;
@@ -490,17 +490,17 @@ void VCLXButton::setProperty( const OUString& PropertyName, const ::com::sun::st
switch ( nPropType )
{
case BASEPROPERTY_FOCUSONCLICK:
- ::toolkit::adjustBooleanWindowStyle( Value, pButton, WB_NOPOINTERFOCUS, sal_True );
+ ::toolkit::adjustBooleanWindowStyle( Value, pButton, WB_NOPOINTERFOCUS, true );
break;
case BASEPROPERTY_TOGGLE:
- ::toolkit::adjustBooleanWindowStyle( Value, pButton, WB_TOGGLE, sal_False );
+ ::toolkit::adjustBooleanWindowStyle( Value, pButton, WB_TOGGLE, false );
break;
case BASEPROPERTY_DEFAULTBUTTON:
{
WinBits nStyle = pButton->GetStyle() | WB_DEFBUTTON;
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( ( Value >>= b ) && !b )
nStyle &= ~WB_DEFBUTTON;
pButton->SetStyle( nStyle );
@@ -536,16 +536,16 @@ void VCLXButton::setProperty( const OUString& PropertyName, const ::com::sun::st
switch ( nPropType )
{
case BASEPROPERTY_FOCUSONCLICK:
- aProp <<= (sal_Bool)( ( pButton->GetStyle() & WB_NOPOINTERFOCUS ) == 0 );
+ aProp <<= ( ( pButton->GetStyle() & WB_NOPOINTERFOCUS ) == 0 );
break;
case BASEPROPERTY_TOGGLE:
- aProp <<= (sal_Bool)( ( pButton->GetStyle() & WB_TOGGLE ) != 0 );
+ aProp <<= ( ( pButton->GetStyle() & WB_TOGGLE ) != 0 );
break;
case BASEPROPERTY_DEFAULTBUTTON:
{
- aProp <<= (sal_Bool) ( ( pButton->GetStyle() & WB_DEFBUTTON ) ? sal_True : sal_False );
+ aProp <<= ( pButton->GetStyle() & WB_DEFBUTTON ) != 0;
}
break;
case BASEPROPERTY_STATE:
@@ -705,7 +705,7 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s
case BASEPROPERTY_SCALEIMAGE:
{
// this is for compatibility only, nowadays, the ImageScaleMode property should be used
- sal_Bool bScaleImage = sal_False;
+ bool bScaleImage = false;
if ( pImageControl && ( Value >>= bScaleImage ) )
{
pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::ANISOTROPIC : ImageScaleMode::NONE );
@@ -873,10 +873,10 @@ void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeExcep
// pCheckBox->GetClickHdl().Call( pCheckBox );
// #107218# Call same virtual methods and listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pCheckBox->Toggle();
pCheckBox->Click();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -958,7 +958,7 @@ void VCLXCheckBox::setProperty( const OUString& PropertyName, const ::com::sun::
case BASEPROPERTY_TRISTATE:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pCheckBox->EnableTriState( b );
}
@@ -993,7 +993,7 @@ void VCLXCheckBox::setProperty( const OUString& PropertyName, const ::com::sun::
aProp = ::toolkit::getVisualEffect( pCheckBox );
break;
case BASEPROPERTY_TRISTATE:
- aProp <<= (sal_Bool)pCheckBox->IsTriStateEnabled();
+ aProp <<= pCheckBox->IsTriStateEnabled();
break;
case BASEPROPERTY_STATE:
aProp <<= (sal_Int16)pCheckBox->GetState();
@@ -1133,7 +1133,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su
sal_Int16 n = sal_Int16();
if ( Value >>= n )
{
- sal_Bool b = n ? sal_True : sal_False;
+ bool b = n ? sal_True : sal_False;
if ( pButton->IsRadioCheckEnabled() )
pButton->Check( b );
else
@@ -1143,7 +1143,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su
break;
case BASEPROPERTY_AUTOTOGGLE:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pButton->EnableRadioCheck( b );
}
@@ -1174,7 +1174,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su
aProp <<= (sal_Int16) ( pButton->IsChecked() ? 1 : 0 );
break;
case BASEPROPERTY_AUTOTOGGLE:
- aProp <<= (sal_Bool) pButton->IsRadioCheckEnabled();
+ aProp <<= pButton->IsRadioCheckEnabled();
break;
default:
{
@@ -1237,9 +1237,9 @@ void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::Runtim
// pRadioButton->GetClickHdl().Call( pRadioButton );
// #107218# Call same virtual methods and listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pRadioButton->Click();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -1686,9 +1686,9 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com:
// ImplCallItemListeners();
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pBox->Select();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -1699,14 +1699,14 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1
ListBox* pBox = (ListBox*) GetWindow();
if ( pBox )
{
- sal_Bool bChanged = sal_False;
+ bool bChanged = false;
for ( sal_uInt16 n = (sal_uInt16)aPositions.getLength(); n; )
{
sal_uInt16 nPos = (sal_uInt16) aPositions.getConstArray()[--n];
if ( pBox->IsEntryPosSelected( nPos ) != bool(bSelect) )
{
pBox->SelectEntryPos( nPos, bSelect );
- bChanged = sal_True;
+ bChanged = true;
}
}
@@ -1716,9 +1716,9 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1
// ImplCallItemListeners();
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pBox->Select();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
}
@@ -1760,7 +1760,7 @@ sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeExcept
{
SolarMutexGuard aGuard;
- sal_Bool bMulti = sal_False;
+ bool bMulti = false;
ListBox* pBox = (ListBox*) GetWindow();
if ( pBox )
bMulti = pBox->IsMultiSelectionEnabled();
@@ -1800,7 +1800,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
if( pListBox )
{
- sal_Bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? sal_True : sal_False;
+ bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? sal_True : sal_False;
if ( bDropDown && !IsSynthesizingVCLEvent() && maActionListeners.getLength() )
{
// Call ActionListener on DropDown event
@@ -1860,20 +1860,20 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s
break;
case BASEPROPERTY_READONLY:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pListBox->SetReadOnly( b);
}
break;
case BASEPROPERTY_MULTISELECTION:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pListBox->EnableMultiSelection( b );
}
break;
case BASEPROPERTY_MULTISELECTION_SIMPLEMODE:
- ::toolkit::adjustBooleanWindowStyle( Value, pListBox, WB_SIMPLEMODE, sal_False );
+ ::toolkit::adjustBooleanWindowStyle( Value, pListBox, WB_SIMPLEMODE, false );
break;
case BASEPROPERTY_LINECOUNT:
{
@@ -1934,17 +1934,17 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s
break;
case BASEPROPERTY_READONLY:
{
- aProp <<= (sal_Bool) pListBox->IsReadOnly();
+ aProp <<= pListBox->IsReadOnly();
}
break;
case BASEPROPERTY_MULTISELECTION:
{
- aProp <<= (sal_Bool) pListBox->IsMultiSelectionEnabled();
+ aProp <<= pListBox->IsMultiSelectionEnabled();
}
break;
case BASEPROPERTY_MULTISELECTION_SIMPLEMODE:
{
- aProp <<= (sal_Bool)( ( pListBox->GetStyle() & WB_SIMPLEMODE ) == 0 );
+ aProp <<= ( ( pListBox->GetStyle() & WB_SIMPLEMODE ) == 0 );
}
break;
case BASEPROPERTY_LINECOUNT:
@@ -2406,7 +2406,7 @@ throw(::com::sun::star::uno::RuntimeException)
Dialog* pDialog = (Dialog*)GetWindow();
if ( pDialog )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -2559,7 +2559,7 @@ throw(::com::sun::star::uno::RuntimeException)
TabControl* pTabControl = (TabControl*)GetWindow();
if ( pTabControl )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -2809,7 +2809,7 @@ throw(::com::sun::star::uno::RuntimeException)
TabPage* pTabPage = (TabPage*)GetWindow();
if ( pTabPage )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -3536,14 +3536,14 @@ void VCLXScrollBar::setProperty( const OUString& PropertyName, const ::com::sun:
ScrollBar* pScrollBar = (ScrollBar*)GetWindow();
if ( pScrollBar )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
{
case BASEPROPERTY_LIVE_SCROLL:
{
- sal_Bool bDo = sal_False;
+ bool bDo = false;
if ( !bVoid )
{
OSL_VERIFY( Value >>= bDo );
@@ -3658,7 +3658,7 @@ void VCLXScrollBar::setProperty( const OUString& PropertyName, const ::com::sun:
{
case BASEPROPERTY_LIVE_SCROLL:
{
- aProp <<= (sal_Bool)( 0 != ( pScrollBar->GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_SCROLL ) );
+ aProp <<= ( 0 != ( pScrollBar->GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_SCROLL ) );
}
break;
case BASEPROPERTY_SCROLLVALUE:
@@ -3872,10 +3872,10 @@ void VCLXEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::Run
pEdit->SetText( aText );
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -3890,10 +3890,10 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const O
pEdit->ReplaceSelected( aText );
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -3995,14 +3995,14 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star
switch ( nPropType )
{
case BASEPROPERTY_HIDEINACTIVESELECTION:
- ::toolkit::adjustBooleanWindowStyle( Value, pEdit, WB_NOHIDESELECTION, sal_True );
+ ::toolkit::adjustBooleanWindowStyle( Value, pEdit, WB_NOHIDESELECTION, true );
if ( pEdit->GetSubEdit() )
- ::toolkit::adjustBooleanWindowStyle( Value, pEdit->GetSubEdit(), WB_NOHIDESELECTION, sal_True );
+ ::toolkit::adjustBooleanWindowStyle( Value, pEdit->GetSubEdit(), WB_NOHIDESELECTION, true );
break;
case BASEPROPERTY_READONLY:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
pEdit->SetReadOnly( b );
}
@@ -4041,10 +4041,10 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star
switch ( nPropType )
{
case BASEPROPERTY_HIDEINACTIVESELECTION:
- aProp <<= (sal_Bool)( ( pEdit->GetStyle() & WB_NOHIDESELECTION ) == 0 );
+ aProp <<= ( ( pEdit->GetStyle() & WB_NOHIDESELECTION ) == 0 );
break;
case BASEPROPERTY_READONLY:
- aProp <<= (sal_Bool) pEdit->IsReadOnly();
+ aProp <<= pEdit->IsReadOnly();
break;
case BASEPROPERTY_ECHOCHAR:
aProp <<= (sal_Int16) pEdit->GetEchoChar();
@@ -4410,7 +4410,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun::
break;
case BASEPROPERTY_AUTOCOMPLETE:
{
- aProp <<= (sal_Bool) pComboBox->IsAutocompleteEnabled();
+ aProp <<= pComboBox->IsAutocompleteEnabled();
}
break;
case BASEPROPERTY_STRINGITEMLIST:
@@ -4660,7 +4660,7 @@ VCLXFormattedSpinField::~VCLXFormattedSpinField()
{
}
-void VCLXFormattedSpinField::setStrictFormat( sal_Bool bStrict )
+void VCLXFormattedSpinField::setStrictFormat( bool bStrict )
{
SolarMutexGuard aGuard;
@@ -4669,7 +4669,7 @@ void VCLXFormattedSpinField::setStrictFormat( sal_Bool bStrict )
pFormatter->SetStrictFormat( bStrict );
}
-sal_Bool VCLXFormattedSpinField::isStrictFormat()
+bool VCLXFormattedSpinField::isStrictFormat()
{
FormatterBase* pFormatter = GetFormatter();
return pFormatter ? pFormatter->IsStrictFormat() : sal_False;
@@ -4688,7 +4688,7 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const ::
{
case BASEPROPERTY_SPIN:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
{
WinBits nStyle = GetWindow()->GetStyle() | WB_SPIN;
@@ -4700,7 +4700,7 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const ::
break;
case BASEPROPERTY_STRICTFORMAT:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
{
pFormatter->SetStrictFormat( b );
@@ -4728,12 +4728,12 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const ::
{
case BASEPROPERTY_TABSTOP:
{
- aProp <<= (sal_Bool) ( ( GetWindow()->GetStyle() & WB_SPIN ) ? sal_True : sal_False );
+ aProp <<= ( GetWindow()->GetStyle() & WB_SPIN ) != 0;
}
break;
case BASEPROPERTY_STRICTFORMAT:
{
- aProp <<= (sal_Bool) pFormatter->IsStrictFormat();
+ aProp <<= pFormatter->IsStrictFormat();
}
break;
default:
@@ -4826,7 +4826,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun:
if ( GetWindow() )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -4869,14 +4869,14 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun:
break;
case BASEPROPERTY_DATESHOWCENTURY:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
((DateField*)GetWindow())->SetShowDateCentury( b );
}
break;
case BASEPROPERTY_ENFORCE_FORMAT:
{
- sal_Bool bEnforce( sal_True );
+ bool bEnforce( true );
OSL_VERIFY( Value >>= bEnforce );
static_cast< DateField* >( GetWindow() )->EnforceValidValue( bEnforce );
}
@@ -4922,7 +4922,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun:
break;
case BASEPROPERTY_ENFORCE_FORMAT:
{
- aProp <<= (sal_Bool)static_cast< DateField* >( GetWindow() )->IsEnforceValidValue( );
+ aProp <<= static_cast< DateField* >( GetWindow() )->IsEnforceValidValue( );
}
break;
default:
@@ -4945,10 +4945,10 @@ void VCLXDateField::setDate( const util::Date& aDate ) throw(::com::sun::star::u
pDateField->SetDate( aDate );
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pDateField->SetModifyFlag();
pDateField->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -5070,10 +5070,10 @@ void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException)
pDateField->SetEmptyDate();
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pDateField->SetModifyFlag();
pDateField->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -5178,10 +5178,10 @@ void VCLXTimeField::setTime( const util::Time& aTime ) throw(::com::sun::star::u
pTimeField->SetTime( aTime );
// #107218# Call same listeners like VCL would do after user interaction
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pTimeField->SetModifyFlag();
pTimeField->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -5310,7 +5310,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun:
if ( GetWindow() )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -5353,7 +5353,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun:
break;
case BASEPROPERTY_ENFORCE_FORMAT:
{
- sal_Bool bEnforce( sal_True );
+ bool bEnforce( true );
OSL_VERIFY( Value >>= bEnforce );
static_cast< TimeField* >( GetWindow() )->EnforceValidValue( bEnforce );
}
@@ -5393,7 +5393,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun:
break;
case BASEPROPERTY_ENFORCE_FORMAT:
{
- aProp <<= (sal_Bool)static_cast< TimeField* >( GetWindow() )->IsEnforceValidValue( );
+ aProp <<= static_cast< TimeField* >( GetWindow() )->IsEnforceValidValue( );
}
break;
default:
@@ -5484,10 +5484,10 @@ void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
Edit* pEdit = (Edit*)GetWindow();
if ( pEdit )
{
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
}
@@ -5640,7 +5640,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s
if ( GetWindow() )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -5690,7 +5690,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s
break;
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
((NumericField*)GetWindow())->SetUseThousandSep( b );
}
@@ -5736,7 +5736,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s
break;
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
{
- aProp <<= (sal_Bool) ((NumericField*)GetWindow())->IsUseThousandSep();
+ aProp <<= ((NumericField*)GetWindow())->IsUseThousandSep();
}
break;
default:
@@ -5865,10 +5865,10 @@ void VCLXMetricField::CallListeners()
Edit* pEdit = (Edit*)GetWindow();
if ( pEdit )
{
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
@@ -5940,7 +5940,7 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su
}
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
{
- sal_Bool b = sal_False;
+ bool b = false;
if ( Value >>= b )
((NumericField*)GetWindow())->SetUseThousandSep( b );
}
@@ -5980,7 +5980,7 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::su
switch ( nPropType )
{
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
- aProp <<= (sal_Bool) ((NumericField*)GetWindow())->IsUseThousandSep();
+ aProp <<= ((NumericField*)GetWindow())->IsUseThousandSep();
break;
case BASEPROPERTY_UNIT:
aProp <<= (sal_uInt16) ((MetricField*)GetWindow())->GetUnit();
@@ -6080,10 +6080,10 @@ void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
Edit* pEdit = (Edit*)GetWindow();
if ( pEdit )
{
- SetSynthesizingVCLEvent( sal_True );
+ SetSynthesizingVCLEvent( true );
pEdit->SetModifyFlag();
pEdit->Modify();
- SetSynthesizingVCLEvent( sal_False );
+ SetSynthesizingVCLEvent( false );
}
}
}
@@ -6236,7 +6236,7 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::
if ( GetWindow() )
{
- sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+ bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch ( nPropType )
@@ -6293,7 +6293,7 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::
break;
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
{
- sal_Bool b = sal_Bool();
+ bool b = bool();
if ( Value >>= b )
((LongCurrencyField*)GetWindow())->SetUseThousandSep( b );
}
@@ -6344,7 +6344,7 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::
break;
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
{
- aProp <<= (sal_Bool) ((LongCurrencyField*)GetWindow())->IsUseThousandSep();
+ aProp <<= ((LongCurrencyField*)GetWindow())->IsUseThousandSep();
}
break;
default:
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 842072c..729912c 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -340,7 +340,7 @@ namespace toolkit {
return makeAny( (sal_Int32) 100 );
case BASEPROPERTY_AUTO_REPEAT:
- return makeAny( (sal_Bool)sal_True );
+ return makeAny( true );
case BASEPROPERTY_IMAGE_SCALE_MODE:
return makeAny( ImageScaleMode::NONE );
@@ -379,7 +379,7 @@ namespace toolkit {
::sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException)
{
- sal_Bool bAutoRepeat( sal_True );
+ bool bAutoRepeat( true );
OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ) ) >>= bAutoRepeat );
return bAutoRepeat;
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index e9edfeb..6a83618 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -214,8 +214,8 @@ ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponen
:ControlModelContainer_IBase( rxContext )
,maContainerListeners( *this )
,maChangeListeners ( GetMutex() )
- ,mbGroupsUpToDate( sal_False )
- ,m_bEnabled( sal_True )
+ ,mbGroupsUpToDate( false )
+ ,m_bEnabled( true )
,m_nTabPageId(0)
{
}
@@ -224,7 +224,7 @@ ControlModelContainerBase::ControlModelContainerBase( const ControlModelContaine
: ControlModelContainer_IBase( rModel )
, maContainerListeners( *this )
, maChangeListeners ( GetMutex() )
- , mbGroupsUpToDate( sal_False )
+ , mbGroupsUpToDate( false )
, m_bEnabled( rModel.m_bEnabled )
, m_nTabPageId( rModel.m_nTabPageId )
{
@@ -233,7 +233,7 @@ ControlModelContainerBase::ControlModelContainerBase( const ControlModelContaine
ControlModelContainerBase::~ControlModelContainerBase()
{
maModels.clear();
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
}
Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -296,7 +296,7 @@ void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException)
::std::for_each( aChildModels.begin(), aChildModels.end(), DisposeControlModel() );
aChildModels.clear();
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
}
// XMultiPropertySet
@@ -609,7 +609,7 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any&
if ( xAllChildren.is() )
updateUserFormChildren( xAllChildren, aName, Insert, xM );
maModels.push_back( UnoControlModelHolder( xM, aName ) );
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
startControlListening( xM );
ContainerEvent aEvent;
@@ -648,7 +648,7 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu
stopControlListening( aElementPos->first );
Reference< XPropertySet > xPS( aElementPos->first, UNO_QUERY );
maModels.erase( aElementPos );
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
if ( xPS.is() )
{
@@ -708,7 +708,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer
if ( xPSI.is() && xPSI->hasPropertyByName( getTabIndexPropertyName() ) )
xProps->setPropertyValue( getTabIndexPropertyName(), makeAny( nTabIndex++ ) );
}
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
}
}
@@ -958,7 +958,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
Reference< XServiceInfo > xModelSI; // for checking for a radion button
AllGroups::iterator aCurrentGroup = maGroups.end(); // the group which we're currently building
sal_Int32 nCurrentGroupStep = -1; // the step which all controls of the current group belong to
- sal_Bool bIsRadioButton; // is it a radio button?
+ bool bIsRadioButton; // is it a radio button?
#if OSL_DEBUG_LEVEL > 1
::std::vector< OUString > aCurrentGroupLabels;
@@ -1066,7 +1066,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
}
}
- mbGroupsUpToDate = sal_True;
+ mbGroupsUpToDate = true;
}
@@ -1089,7 +1089,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve
sAccessor = aPos->second;
// our groups are not up-to-date
- mbGroupsUpToDate = sal_False;
+ mbGroupsUpToDate = false;
// notify
implNotifyTabModelChange( sAccessor );
@@ -1440,7 +1440,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
}
else
{
- Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( sal_True );
+ Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true );
Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM;
@@ -1533,7 +1533,7 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod
xChangeNotifier->removeChangesListener( this );
}
- sal_Bool bRet = UnoControl::setModel( rxModel );
+ bool bRet = UnoControl::setModel( rxModel );
if ( getModel().is() )
{
@@ -1690,7 +1690,7 @@ void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyC
{
const PropertyChangeEvent& rEvt = rEvents.getConstArray()[i];
Reference< XControlModel > xModel( rEvt.Source, UNO_QUERY );
- sal_Bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get();
+ bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get();
if ( ( rEvt.PropertyName == s1 ) ||
( rEvt.PropertyName == s2 ) ||
( rEvt.PropertyName == s3 ) ||
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 954619d..a4ca7b9 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -195,7 +195,7 @@ UnoControlDialogModel::UnoControlDialogModel( const Reference< XComponentContext
ImplRegisterProperty( BASEPROPERTY_SCROLLLEFT );
Any aBool;
- aBool <<= (sal_Bool) sal_True;
+ aBool <<= true;
ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
// #TODO separate class for 'UserForm' ( instead of re-using Dialog ? )
@@ -321,7 +321,7 @@ UnoDialogControl::~UnoDialogControl()
OUString UnoDialogControl::GetComponentServiceName()
{
- sal_Bool bDecoration( sal_True );
+ bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
return OUString("Dialog");
@@ -350,7 +350,7 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel )
{
// #Can we move all the Resource stuff to the ControlContainerBase ?
SolarMutexGuard aGuard;
- sal_Bool bRet = ControlContainerBase::setModel( rxModel );
+ bool bRet = ControlContainerBase::setModel( rxModel );
ImplStartListingForResourceEvents();
return bRet;
}
@@ -387,7 +387,7 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc )
{
UnoControlContainer::PrepareWindowDescriptor( rDesc );
- sal_Bool bDecoration( sal_True );
+ bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( !bDecoration )
{
@@ -411,7 +411,7 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes
uno::makeAny( aImageURL ) );
xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl );
- ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True );
+ ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), true );
}
}
@@ -570,7 +570,7 @@ void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException)
SolarMutexGuard aGuard;
Any aAny;
aAny <<= Title;
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), aAny, sal_True );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), aAny, true );
}
OUString UnoDialogControl::getTitle() throw(RuntimeException)
@@ -588,9 +588,9 @@ sal_Int16 UnoDialogControl::execute() throw(RuntimeException)
Reference< XDialog > xDlg( getPeer(), UNO_QUERY );
if( xDlg.is() )
{
- GetComponentInfos().bVisible = sal_True;
+ GetComponentInfos().bVisible = true;
nDone = xDlg->execute();
- GetComponentInfos().bVisible = sal_False;
+ GetComponentInfos().bVisible = false;
}
}
return nDone;
@@ -605,7 +605,7 @@ void UnoDialogControl::endExecute() throw(RuntimeException)
if( xDlg.is() )
{
xDlg->endExecute();
- GetComponentInfos().bVisible = sal_False;
+ GetComponentInfos().bVisible = false;
}
}
}
@@ -625,7 +625,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
{
const PropertyChangeEvent& rEvt = rEvents.getConstArray()[i];
Reference< XControlModel > xModel( rEvt.Source, UNO_QUERY );
- sal_Bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get();
+ bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get();
if ( bOwnModel && rEvt.PropertyName == "ImageURL" )
{
OUString aImageURL;
@@ -641,7 +641,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl );
}
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC), uno::makeAny( xGraphic ), sal_True );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC), uno::makeAny( xGraphic ), true );
break;
}
}
@@ -674,7 +674,7 @@ void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32,
}
void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException)
{
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_False );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), false );
}
void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException)
@@ -731,7 +731,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut
if ( !xMultiPage.is() )
throw RuntimeException();
xMultiPage->activateTab( ID );
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_True );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), true );
}
@@ -777,7 +777,7 @@ uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(
OUString UnoMultiPageControl::GetComponentServiceName()
{
- sal_Bool bDecoration( sal_True );
+ bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
return OUString("tabcontrol");
@@ -827,7 +827,7 @@ void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, c
if ( nActiveTab && nCtrls ) // Ensure peer is initialise with correct activated tab
{
xTabCntrl->activateTab( nActiveTab );
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( nActiveTab ), sal_True );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( nActiveTab ), true );
}
}
}
@@ -867,7 +867,7 @@ UnoMultiPageModel::UnoMultiPageModel( const Reference< XComponentContext >& rxCo
ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
Any aBool;
- aBool <<= (sal_Bool) sal_True;
+ aBool <<= true;
ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
ImplRegisterProperty( BASEPROPERTY_DECORATION, aBool );
@@ -989,7 +989,7 @@ UnoPageModel::UnoPageModel( const Reference< XComponentContext >& rxContext ) :
// ImplRegisterProperty( BASEPROPERTY_DIALOGSOURCEURL );
Any aBool;
- aBool <<= (sal_Bool) sal_True;
+ aBool <<= true;
ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
//ImplRegisterProperty( BASEPROPERTY_TABSTOP, aBool );
@@ -1107,7 +1107,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
}
else
{
- Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( sal_True );
+ Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true );
Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM;
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index 35999d3..59df35a 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -50,7 +50,7 @@ Type NameContainer_Impl::getElementType()
sal_Bool NameContainer_Impl::hasElements()
throw(RuntimeException)
{
- sal_Bool bRet = (mnElementCount > 0);
+ bool bRet = (mnElementCount > 0);
return bRet;
}
@@ -78,7 +78,7 @@ sal_Bool NameContainer_Impl::hasByName( const OUString& aName )
throw(RuntimeException)
{
NameContainerNameMap::iterator aIt = mHashMap.find( aName );
- sal_Bool bRet = ( aIt != mHashMap.end() );
+ bool bRet = ( aIt != mHashMap.end() );
return bRet;
}
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index a7c44e8..ce0bcbb 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -151,7 +151,7 @@ namespace toolkit
ImplRegisterProperty( BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR );
Any aTreatAsNumber;
- aTreatAsNumber <<= (sal_Bool) sal_True;
+ aTreatAsNumber <<= true;
ImplRegisterProperty( BASEPROPERTY_TREATASNUMBER, aTreatAsNumber );
lcl_registerDefaultFormatsClient();
@@ -332,7 +332,7 @@ namespace toolkit
{
double dVal = 0;
OUString sVal;
- sal_Bool bStreamed = (rValue >>= dVal);
+ bool bStreamed = (rValue >>= dVal);
if ( bStreamed )
{
rConvertedValue <<= dVal;
@@ -380,7 +380,7 @@ namespace toolkit
{
case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= OUString( OUString::createFromAscii( szServiceName_UnoControlFormattedField ) ); break;
- case BASEPROPERTY_TREATASNUMBER: aReturn <<= (sal_Bool)sal_True; break;
+ case BASEPROPERTY_TREATASNUMBER: aReturn <<= true; break;
case BASEPROPERTY_EFFECTIVE_DEFAULT:
case BASEPROPERTY_EFFECTIVE_VALUE:
@@ -446,7 +446,7 @@ namespace toolkit
aValues[0] = xPeer->getProperty( aNames[0] );
aValues[1] = xPeer->getProperty( aNames[1] );
- ImplSetPropertyValues( aNames, aValues, sal_False );
+ ImplSetPropertyValues( aNames, aValues, false );
if ( GetTextListeners().getLength() )
GetTextListeners().textChanged( e );
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index d201068..736125e 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -79,7 +79,7 @@
,m_nHeight(0)
,m_nTabIndex(-1)
,m_nStep(0)
- ,m_bCloneable(sal_False)
+ ,m_bCloneable(false)
{
OSL_ENSURE(NULL != _pAggregateInstance, "OGeometryControlModel_Base::OGeometryControlModel_Base: invalid aggregate!");
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index b4d7817..4c5fb7c 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -181,7 +181,7 @@ namespace toolkit
void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException)
{
- impl_set( m_bResizeable, value, "Resizeable" );
+ impl_set( m_bResizeable, bool(value), "Resizeable" );
}
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index 8a28760..ef0f132 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -118,7 +118,7 @@ private:
sal_Int32 m_nMaxWidth;
sal_Int32 m_nMinWidth;
sal_Int32 m_nFlexibility;
- sal_Bool m_bResizeable;
+ bool m_bResizeable;
OUString m_sTitle;
OUString m_sHelpText;
::com::sun::star::style::HorizontalAlignment m_eHorizontalAlign;
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index ce2df3a..adb1798 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -224,11 +224,11 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
return uno::makeAny( SelectionType(1) );
case BASEPROPERTY_GRID_SHOWROWHEADER:
case BASEPROPERTY_USE_GRID_LINES:
- return uno::makeAny( (sal_Bool)sal_False );
+ return uno::makeAny( false );
case BASEPROPERTY_ROW_HEADER_WIDTH:
return uno::makeAny( sal_Int32( 10 ) );
case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
- return uno::makeAny( (sal_Bool)sal_True );
+ return uno::makeAny( true );
case BASEPROPERTY_COLUMN_HEADER_HEIGHT:
case BASEPROPERTY_ROW_HEIGHT:
case BASEPROPERTY_GRID_HEADER_BACKGROUND:
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 1ddd53e..0f91eaf 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -157,7 +157,7 @@ private:
Neither <member>m_currentSortColumn</member> nor <member>m_sortAscending</member> are touched by this method.
Also, the given column index is not checked, this is the responsibility of the caller.
*/
- bool impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending );
+ bool impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, bool const i_sortAscending );
/** translates the given event, obtained from our delegator, to a version which can be broadcasted to our own
clients.
@@ -196,7 +196,7 @@ private:
css::uno::Reference< css::awt::grid::XMutableGridDataModel > m_delegator;
css::uno::Reference< css::i18n::XCollator > m_collator;
::sal_Int32 m_currentSortColumn;
- ::sal_Bool m_sortAscending;
+ bool m_sortAscending;
::std::vector< ::sal_Int32 > m_publicToPrivateRowIndex;
::std::vector< ::sal_Int32 > m_privateToPublicRowIndex;
};
@@ -572,7 +572,7 @@ private:
CellDataLessComparison(
::std::vector< Any > const & i_data,
::comphelper::IKeyPredicateLess& i_predicate,
- sal_Bool const i_sortAscending
+ bool const i_sortAscending
)
:m_data( i_data )
,m_predicate( i_predicate )
@@ -600,12 +600,12 @@ private:
private:
::std::vector< Any > const & m_data;
::comphelper::IKeyPredicateLess const & m_predicate;
- sal_Bool const m_sortAscending;
+ bool const m_sortAscending;
};
}
- bool SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending )
+ bool SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, bool const i_sortAscending )
{
::sal_Int32 const rowCount( getRowCount() );
::std::vector< ::sal_Int32 > aPublicToPrivate( rowCount );
@@ -679,7 +679,7 @@ private:
lcl_clear( m_privateToPublicRowIndex );
m_currentSortColumn = -1;
- m_sortAscending = sal_True;
+ m_sortAscending = true;
}
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 38c20c0..4cbf5fb 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -88,10 +88,10 @@ static void lcl_throwIndexOutOfBoundsException( )
switch (nPropId)
{
case BASEPROPERTY_COMPLETE:
- aReturn <<= (sal_Bool) sal_True;
+ aReturn <<= true;
break;
case BASEPROPERTY_ACTIVATED:
- aReturn <<= (sal_Bool) sal_True;
+ aReturn <<= true;
break;
case BASEPROPERTY_CURRENTITEMID:
aReturn <<= (sal_Int16) -1;
@@ -186,7 +186,7 @@ static void lcl_throwIndexOutOfBoundsException( )
if ( !xRoadmapItem.is() )
lcl_throwIllegalArgumentException();
Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
- sal_Bool bIsRoadmapItem = xServiceInfo->supportsService("com.sun.star.awt.RoadmapItem");
+ bool bIsRoadmapItem = xServiceInfo->supportsService("com.sun.star.awt.RoadmapItem");
if ( !bIsRoadmapItem )
lcl_throwIllegalArgumentException();
}
@@ -217,13 +217,13 @@ static void lcl_throwIndexOutOfBoundsException( )
sal_Int32 UnoControlRoadmapModel::GetUniqueID()
{
Any aAny;
- sal_Bool bIncrement = sal_True;
+ bool bIncrement = true;
sal_Int32 CurID = 0;
sal_Int32 n_CurItemID = 0;
Reference< XInterface > CurRoadmapItem;
while ( bIncrement )
{
- bIncrement = sal_False;
+ bIncrement = false;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list