mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolkit: sal_Bool -> bool

Browse Source 
Change-Id: I5153c4413004d1b50cc503b3e70657bc831a5793
This commit is contained in:
Stephan Bergmann 2014-02-24 11:13:09 +01:00
parent 569756aaf4
commit 146c7c5c89
64 changed files with 475 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbaccess/source/ui/uno/ColumnControl.cxx
View File

@ -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;
}
}

6
forms/source/richtext/richtextcontrol.cxx
View File

@ -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 );
}

2
forms/source/richtext/richtextcontrol.hxx
View File

@ -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;
};
//==================================================================

4
forms/source/solar/component/navbarcontrol.cxx
View File

@ -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() );
}

2
include/toolkit/awt/vclxdevice.hxx
View File

@ -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);

2
include/toolkit/awt/vclxfont.hxx
View File

@ -45,7 +45,7 @@ private:
FontMetric* mpFontMetric;
protected:
sal_Bool ImplAssertValidFontMetric();
bool ImplAssertValidFontMetric();
::osl::Mutex& GetMutex() { return maMutex; }
public:

4
include/toolkit/awt/vclxmenu.hxx
View File

@ -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);

2
include/toolkit/awt/vclxprinter.hxx
View File

@ -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();

4
include/toolkit/awt/vclxwindow.hxx
View File

@ -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 );

4
include/toolkit/awt/vclxwindows.hxx
View File

@ -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);

4
include/toolkit/controls/controlmodelcontainerbase.hxx
View File

@ -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;

2
include/toolkit/controls/eventcontainer.hxx
View File

@ -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 );
}

2
include/toolkit/controls/geometrycontrolmodel.hxx
View File

@ -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;

4
include/toolkit/controls/roadmapentry.hxx
View File

@ -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>
};

4
include/toolkit/controls/stdtabcontroller.hxx
View File

@ -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();

4
include/toolkit/controls/stdtabcontrollermodel.hxx
View File

@ -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; }

22
include/toolkit/controls/unocontrol.hxx
View File

@ -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();

10
include/toolkit/controls/unocontrolbase.hxx
View File

@ -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 );

2
include/toolkit/controls/unocontrolmodel.hxx
View File

@ -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

11
include/toolkit/controls/unocontrols.hxx
View File

@ -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();

4
include/toolkit/helper/property.hxx
View File

@ -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 );

2
include/toolkit/helper/unopropertyarrayhelper.hxx
View File

@ -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 );

4
include/toolkit/helper/unowrapper.hxx
View File

@ -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 );

2
include/toolkit/helper/vclunohelper.hxx
View File

@ -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 );

4
svtools/source/uno/unoiface.cxx
View File

@ -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 );
}
}

6
svx/source/fmcomp/fmgridif.cxx
View File

@ -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)
{

2
toolkit/source/awt/animatedimagespeer.cxx
View File

@ -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;

4
toolkit/source/awt/vclxcontainer.cxx
View File

@ -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 )

2
toolkit/source/awt/vclxdevice.cxx
View File

@ -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;

2
toolkit/source/awt/vclxfont.cxx
View File

@ -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() )
{

30
toolkit/source/awt/vclxmenu.cxx
View File

@ -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 )

12
toolkit/source/awt/vclxprinter.cxx
View File

@ -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();

4
toolkit/source/awt/vclxspinbutton.cxx
View File

@ -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() )
{

6
toolkit/source/awt/vclxtoolkit.cxx
View File

@ -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) )

78
toolkit/source/awt/vclxwindow.cxx
View File

@ -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 );

2
toolkit/source/awt/vclxwindow1.cxx
View File

@ -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) )
{

162
toolkit/source/awt/vclxwindows.cxx
View File

@ -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:

4
toolkit/source/controls/animatedimages.cxx
View File

@ -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;
}

28
toolkit/source/controls/controlmodelcontainerbase.cxx
View File

@ -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 ) ||

36
toolkit/source/controls/dialogcontrol.cxx
View File

@ -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;

4
toolkit/source/controls/eventcontainer.cxx
View File

@ -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;
}

8
toolkit/source/controls/formattedcontrol.cxx
View File

@ -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 );

2
toolkit/source/controls/geometrycontrolmodel.cxx
View File

@ -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!");

2
toolkit/source/controls/grid/gridcolumn.cxx
View File

@ -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" );
}

2
toolkit/source/controls/grid/gridcolumn.hxx
View File

@ -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;

4
toolkit/source/controls/grid/gridcontrol.cxx
View File

@ -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:

12
toolkit/source/controls/grid/sortablegriddatamodel.cxx
View File

@ -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;
}

14
toolkit/source/controls/roadmapcontrol.cxx
View File

@ -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;
for ( RoadmapItemHolderList::iterator i = maRoadmapItems.begin(); i < maRoadmapItems.end(); ++i )
{
CurRoadmapItem = *i;
@ -232,7 +232,7 @@ static void lcl_throwIndexOutOfBoundsException( )
aAny >>= n_CurItemID;
if (n_CurItemID == CurID)
{
bIncrement = sal_True;
bIncrement = true;
CurID++;
break;
}
@ -375,7 +375,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
if ( xC.is() )
xC->removeContainerListener( this );
sal_Bool bReturn = UnoControlBase::setModel( _rModel );
bool bReturn = UnoControlBase::setModel( _rModel );
xC = xC.query( getModel());
if ( xC.is() )

2
toolkit/source/controls/roadmapentry.cxx
View File

@ -37,7 +37,7 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
& m_nID, ::getCppuType( &m_nID ) );
m_bEnabled = sal_True;
m_bEnabled = true;
registerProperty( OUString("Enabled"), RM_PROPERTY_ID_ENABLED,
::com::sun::star::beans::PropertyAttribute::BOUND |
::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,

20
toolkit/source/controls/stdtabcontroller.cxx
View File

@ -49,14 +49,14 @@ StdTabController::~StdTabController()
{
}
sal_Bool StdTabController::ImplCreateComponentSequence(
bool StdTabController::ImplCreateComponentSequence(
Sequence< Reference< XControl > >& rControls,
const Sequence< Reference< XControlModel > >& rModels,
Sequence< Reference< XWindow > >& rComponents,
Sequence< Any>* pTabStops,
sal_Bool bPeerComponent ) const
bool bPeerComponent ) const
{
sal_Bool bOK = sal_True;
bool bOK = true;
// Get only the requested controls
sal_Int32 nModels = rModels.getLength();
@ -123,13 +123,13 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
else
{
OSL_TRACE( "ImplCreateComponentSequence: Control not found" );
bOK = sal_False;
bOK = false;
}
}
return bOK;
}
void StdTabController::ImplActivateControl( sal_Bool bFirst ) const
void StdTabController::ImplActivateControl( bool bFirst ) const
{
// HACK due to bug #53688#, map controls onto an interface if remote controls may occur
Reference< XTabController > xTabController(const_cast< ::cppu::OWeakObject* >(static_cast< const ::cppu::OWeakObject* >(this)), UNO_QUERY);
@ -244,7 +244,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException)
// #58317# Some Models may be missing from the Container. Plus there is a
// autoTabOrder call later on.
if( !ImplCreateComponentSequence( aControls, aSeq, aCompSeq, NULL, sal_False ) )
if( !ImplCreateComponentSequence( aControls, aSeq, aCompSeq, NULL, false ) )
return;
sal_uInt32 nCtrls = aCompSeq.getLength();
@ -320,7 +320,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException)
// #58317# Some Models may be missing from the Container. Plus there is a
// autoTabOrder call later on.
if( !ImplCreateComponentSequence( aControls, aModels, aCompSeq, &aTabSeq, sal_True ) )
if( !ImplCreateComponentSequence( aControls, aModels, aCompSeq, &aTabSeq, true ) )
return;
xVclContainerPeer->setTabOrder( aCompSeq, aTabSeq, mxModel->getGroupControl() );
@ -342,7 +342,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException)
aControlComponents.realloc( 0 );
ImplCreateComponentSequence( aControls, aThisGroupModels, aControlComponents, NULL, sal_True );
ImplCreateComponentSequence( aControls, aThisGroupModels, aControlComponents, NULL, true );
xVclContainerPeer->setGroup( aControlComponents );
}
}
@ -352,7 +352,7 @@ void StdTabController::activateFirst( ) throw(RuntimeException)
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary?
ImplActivateControl( sal_True );
ImplActivateControl( true );
}
void StdTabController::activateLast( ) throw(RuntimeException)
@ -360,7 +360,7 @@ void StdTabController::activateLast( ) throw(RuntimeException)
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary?
ImplActivateControl( sal_False );
ImplActivateControl( false );
}

10
toolkit/source/controls/stdtabcontrollermodel.cxx
View File

@ -91,7 +91,7 @@ void UnoControlModelEntryList::insert( size_t i, UnoControlModelEntry* item ) {
// ----------------------------------------------------
StdTabControllerModel::StdTabControllerModel()
{
mbGroupControl = sal_True;
mbGroupControl = true;
}
StdTabControllerModel::~StdTabControllerModel()
@ -136,7 +136,7 @@ void StdTabControllerModel::ImplSetControlModels( UnoControlModelEntryList& rLis
for ( sal_uInt32 n = 0; n < nControls; n++ )
{
UnoControlModelEntry* pNewEntry = new UnoControlModelEntry;
pNewEntry->bGroup = sal_False;
pNewEntry->bGroup = false;
pNewEntry->pxControl = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > ;
*pNewEntry->pxControl = pRefs[n];
rList.push_back( pNewEntry );
@ -269,12 +269,12 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c
// Nested groups are not possible.
// The first element of a group determines its position.
UnoControlModelEntry* pNewEntry = new UnoControlModelEntry;
pNewEntry->bGroup = sal_True;
pNewEntry->bGroup = true;
pNewEntry->pGroup = new UnoControlModelEntryList;
pNewEntry->pGroup->SetName( GroupName );
ImplSetControlModels( *pNewEntry->pGroup, Group );
sal_Bool bInserted = sal_False;
bool bInserted = false;
size_t nElements = pNewEntry->pGroup->size();
for ( size_t n = 0; n < nElements; n++ )
{
@ -290,7 +290,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c
if ( !bInserted )
{
maControls.insert( nPos, pNewEntry );
bInserted = sal_True;
bInserted = true;
}
}
}

22
toolkit/source/controls/tkscrollbar.cxx
View File

@ -54,7 +54,7 @@ namespace toolkit
switch ( nPropId )
{
case BASEPROPERTY_LIVE_SCROLL:
return uno::makeAny( (sal_Bool)sal_False );
return uno::makeAny( false );
case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlScrollBar ) );
@ -144,7 +144,7 @@ namespace toolkit
{
uno::Any aAny;
aAny <<= xScrollBar->getValue();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), aAny, false );
}
}
break;
@ -172,18 +172,18 @@ namespace toolkit
void UnoScrollBarControl::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), true );
}
void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aAny;
aAny <<= nValue;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), aAny, true );
aAny <<= nVisible;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), aAny, true );
aAny <<= nMax;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), aAny, true );
}
sal_Int32 UnoScrollBarControl::getValue() throw(::com::sun::star::uno::RuntimeException)
@ -199,7 +199,7 @@ namespace toolkit
void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), true );
}
sal_Int32 UnoScrollBarControl::getMaximum() throw(::com::sun::star::uno::RuntimeException)
@ -215,7 +215,7 @@ namespace toolkit
void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), true );
}
sal_Int32 UnoScrollBarControl::getLineIncrement() throw(::com::sun::star::uno::RuntimeException)
@ -231,7 +231,7 @@ namespace toolkit
void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), true );
}
sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException)
@ -247,7 +247,7 @@ namespace toolkit
void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), true );
}
sal_Int32 UnoScrollBarControl::getVisibleSize() throw(::com::sun::star::uno::RuntimeException)
@ -263,7 +263,7 @@ namespace toolkit
void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), true );
}
sal_Int32 UnoScrollBarControl::getOrientation() throw(::com::sun::star::uno::RuntimeException)

20
toolkit/source/controls/tkspinbutton.cxx
View File

@ -158,7 +158,7 @@ public:
return makeAny( (sal_Int16) 0 );
case BASEPROPERTY_REPEAT:
return makeAny( (sal_Bool)sal_True );
return makeAny( true );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
@ -280,7 +280,7 @@ public:
case AdjustmentType_ADJUST_LINE:
case AdjustmentType_ADJUST_PAGE:
case AdjustmentType_ADJUST_ABS:
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( rEvent.Value ), sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( rEvent.Value ), false );
break;
default:
OSL_FAIL( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" );
@ -311,15 +311,15 @@ public:
void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), true );
}
void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), true );
}
@ -338,13 +338,13 @@ public:
void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true );
}
void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true );
}
@ -376,7 +376,7 @@ public:
void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), true );
}
@ -395,7 +395,7 @@ public:
void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
{
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), true );
}

8
toolkit/source/controls/tree/treedatamodel.cxx
View File

@ -87,7 +87,7 @@ class MutableTreeNode: public ::cppu::WeakAggImplHelper2< XMutableTreeNode, XSer
friend class MutableTreeDataModel;
public:
MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildrenOnDemand );
MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, bool bChildrenOnDemand );
virtual ~MutableTreeNode();
void setParent( MutableTreeNode* pParent );
@ -132,7 +132,7 @@ private:
TreeNodeVector maChildren;
Any maDisplayValue;
Any maDataValue;
sal_Bool mbHasChildrenOnDemand;
bool mbHasChildrenOnDemand;
::osl::Mutex maMutex;
MutableTreeNode* mpParent;
MutableTreeDataModelRef mxModel;
@ -266,7 +266,7 @@ Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( )
return aSeq;
}
MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildrenOnDemand )
MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, bool bChildrenOnDemand )
: maDisplayValue( rValue )
, mbHasChildrenOnDemand( bChildrenOnDemand )
, mpParent( 0 )
@ -397,7 +397,7 @@ void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDeman
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
bChanged = mbHasChildrenOnDemand != bChildrenOnDemand;
bChanged = mbHasChildrenOnDemand != bool(bChildrenOnDemand);
mbHasChildrenOnDemand = bChildrenOnDemand;
}

70
toolkit/source/controls/unocontrol.cxx
View File

@ -146,11 +146,11 @@ UnoControl::UnoControl() :
, mpData( new UnoControl_Data )
{
DBG_CTOR( UnoControl, NULL );
mbDisposePeer = sal_True;
mbRefeshingPeer = sal_False;
mbCreatingPeer = sal_False;
mbCreatingCompatiblePeer = sal_False;
mbDesignMode = sal_False;
mbDisposePeer = true;
mbRefeshingPeer = false;
mbCreatingPeer = false;
mbCreatingCompatiblePeer = false;
mbDesignMode = false;
}
UnoControl::~UnoControl()
@ -164,11 +164,11 @@ OUString UnoControl::GetComponentServiceName()
return OUString();
}
Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer )
Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( bool bAcceptExistingPeer )
{
DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" );
mbCreatingCompatiblePeer = sal_True;
mbCreatingCompatiblePeer = true;
Reference< XWindowPeer > xCompatiblePeer;
@ -178,9 +178,9 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
if ( !xCompatiblePeer.is() )
{
// Create the pair as invisible
sal_Bool bVis = maComponentInfos.bVisible;
bool bVis = maComponentInfos.bVisible;
if( bVis )
maComponentInfos.bVisible = sal_False;
maComponentInfos.bVisible = false;
Reference< XWindowPeer > xCurrentPeer = getPeer();
setPeer( NULL );
@ -201,7 +201,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
}
catch( const Exception& )
{
mbCreatingCompatiblePeer = sal_False;
mbCreatingCompatiblePeer = false;
throw;
}
xCompatiblePeer = getPeer();
@ -215,10 +215,10 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
}
if( bVis )
maComponentInfos.bVisible = sal_True;
maComponentInfos.bVisible = true;
}
mbCreatingCompatiblePeer = sal_False;
mbCreatingCompatiblePeer = false;
return xCompatiblePeer;
}
@ -404,9 +404,9 @@ void UnoControl::removeEventListener( const Reference< XEventListener >& rxListe
maDisposeListeners.removeInterface( rxListener );
}
sal_Bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const
bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const
{
return sal_False;
return false;
}
// XPropertiesChangeListener
@ -482,7 +482,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
// position where to insert the independent properties into aPeerPropertiesToSet,
// dependent ones are inserted at the end of the vector
sal_Bool bNeedNewPeer = sal_False;
bool bNeedNewPeer = false;
// some properties require a re-creation of the peer, 'cause they can't be changed on the fly
Reference< XControlModel > xOwnModel( getModel(), UNO_QUERY );
@ -499,7 +499,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
for( sal_Int32 i = 0; i < nLen; ++i, ++pEvents )
{
Reference< XControlModel > xModel( pEvents->Source, UNO_QUERY );
sal_Bool bOwnModel = xModel.get() == xOwnModel.get();
bool bOwnModel = xModel.get() == xOwnModel.get();
if ( !bOwnModel )
continue;
@ -635,10 +635,10 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
getPeer()->dispose();
mxPeer.clear();
mxVclWindowPeer = NULL;
mbRefeshingPeer = sal_True;
mbRefeshingPeer = true;
Reference< XWindowPeer > xP( xParent, UNO_QUERY );
xThis->createPeer( Reference< XToolkit > (), xP );
mbRefeshingPeer = sal_False;
mbRefeshingPeer = false;
aPeerPropertiesToSet.clear();
}
@ -704,8 +704,8 @@ void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (Runtime
namespace
{
template < typename RETVALTYPE >
RETVALTYPE lcl_askPeer( const uno::Reference< awt::XWindowPeer >& _rxPeer, RETVALTYPE (SAL_CALL XWindow2::*_pMethod)(), RETVALTYPE _aDefault )
template < typename RETVALTYPE, typename DEFAULTTYPE >
RETVALTYPE lcl_askPeer( const uno::Reference< awt::XWindowPeer >& _rxPeer, RETVALTYPE (SAL_CALL XWindow2::*_pMethod)(), DEFAULTTYPE _aDefault )
{
RETVALTYPE aReturn( _aDefault );
@ -1009,7 +1009,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException)
{
::osl::MutexGuard aGuard( GetMutex() );
xDrawPeer = ImplGetCompatiblePeer( sal_True );
xDrawPeer = ImplGetCompatiblePeer( true );
bDisposeDrawPeer = xDrawPeer.is() && ( xDrawPeer != getPeer() );
xDrawPeerView.set( xDrawPeer, UNO_QUERY );
@ -1097,7 +1097,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if( !getPeer().is() )
{
mbCreatingPeer = sal_True;
mbCreatingPeer = true;
WindowClass eType;
Reference< XToolkit > xToolkit = rxToolkit;
@ -1163,7 +1163,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.ParentIndex = -1;
}
@ -1173,7 +1173,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= WindowAttribute::MOVEABLE;
}
@ -1183,7 +1183,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= WindowAttribute::CLOSEABLE;
}
@ -1193,7 +1193,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::DROPDOWN;
}
@ -1203,7 +1203,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::SPIN;
}
@ -1213,7 +1213,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::HSCROLL;
}
@ -1223,7 +1223,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::VSCROLL;
}
@ -1233,7 +1233,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::AUTOHSCROLL;
}
@ -1243,7 +1243,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b)
aDescr.WindowAttributes |= VclWindowPeerAttribute::AUTOVSCROLL;
}
@ -1254,7 +1254,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
if ( xInfo->hasPropertyByName( aPropName ) )
{
aVal = xPSet->getPropertyValue( aPropName );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>=b ) && b )
aDescr.WindowAttributes |= VclWindowPeerAttribute::NOLABEL;
}
@ -1293,7 +1293,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
// Unfortunately, the VCL used in the peers is not threadsafe, and by definition needs a locked SolarMutex.)
// 82300 - 12/21/00 - FS
UnoControlComponentInfos aComponentInfos(maComponentInfos);
sal_Bool bDesignMode(mbDesignMode);
bool bDesignMode(mbDesignMode);
Reference< XGraphics > xGraphics( mxGraphics );
Reference< XView > xView ( getPeer(), UNO_QUERY_THROW );
@ -1322,7 +1322,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
peerCreated();
mbCreatingPeer = sal_False;
mbCreatingPeer = false;
}
}
@ -1388,7 +1388,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
Reference<XComponent> xAccessibleComp;
{
::osl::MutexGuard aGuard( GetMutex() );
if ( bOn == mbDesignMode )
if ( bool(bOn) == mbDesignMode )
return;
// remember this

24
toolkit/source/controls/unocontrolbase.cxx
View File

@ -32,25 +32,25 @@ using namespace com::sun::star;
// class UnoControlBase
// ----------------------------------------------------
sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
{
OUString aPropName( GetPropertyName( nPropId ) );
return ImplHasProperty( aPropName );
}
sal_Bool UnoControlBase::ImplHasProperty( const OUString& aPropertyName )
bool UnoControlBase::ImplHasProperty( const OUString& aPropertyName )
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY );
if ( !xPSet.is() )
return sal_False;
return false;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo();
if ( !xInfo.is() )
return sal_False;
return false;
return xInfo->hasPropertyByName( aPropertyName );
}
void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis )
void UnoControlBase::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::Reference< ::com::sun::star::beans::XMultiPropertySet > xMPS( mxModel, ::com::sun::star::uno::UNO_QUERY );
if ( !mxModel.is() )
@ -81,7 +81,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc
}
}
void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis )
void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, bool bUpdateThis )
{
// Model might be logged off already but an event still fires
if ( mxModel.is() )
@ -136,7 +136,7 @@ template <typename T> T UnoControlBase::ImplGetPropertyValueClass( sal_uInt16 nP
return t;
}
sal_Bool UnoControlBase::ImplGetPropertyValue_BOOL( sal_uInt16 nProp )
bool UnoControlBase::ImplGetPropertyValue_BOOL( sal_uInt16 nProp )
{
return ImplGetPropertyValuePOD<sal_Bool>(nProp);
}
@ -174,7 +174,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
::com::sun::star::awt::Size UnoControlBase::Impl_getMinimumSize()
{
::com::sun::star::awt::Size aSz;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( sal_True );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@ -191,7 +191,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
::com::sun::star::awt::Size UnoControlBase::Impl_getPreferredSize()
{
::com::sun::star::awt::Size aSz;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( sal_True );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@ -208,7 +208,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
::com::sun::star::awt::Size UnoControlBase::Impl_calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize )
{
::com::sun::star::awt::Size aSz;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( sal_True );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@ -225,7 +225,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
::com::sun::star::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
{
::com::sun::star::awt::Size aSz;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( sal_True );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{
@ -241,7 +241,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
{
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( sal_True );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true );
DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() )
{

8
toolkit/source/controls/unocontrolcontainer.cxx
View File

@ -324,12 +324,12 @@ void implUpdateVisibility
aCtrls = xControlContainer->getControls();
const uno::Reference< awt::XControl >* pCtrls = aCtrls.getConstArray();
sal_uInt32 nCtrls = aCtrls.getLength();
sal_Bool bCompleteVisible = (nDialogStep == 0);
bool bCompleteVisible = (nDialogStep == 0);
for( sal_uInt32 n = 0; n < nCtrls; n++ )
{
uno::Reference< awt::XControl > xControl = pCtrls[ n ];
sal_Bool bVisible = bCompleteVisible;
bool bVisible = bCompleteVisible;
if( !bVisible )
{
uno::Reference< awt::XControlModel > xModel( xControl->getModel() );
@ -407,7 +407,7 @@ UnoControlContainer::UnoControlContainer(const uno::Reference< awt::XWindowPeer
,maCListeners( *this )
{
setPeer( xP );
mbDisposePeer = sal_False;
mbDisposePeer = false;
mpControls = new UnoControlHolderList;
}
@ -757,7 +757,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT
if( !getPeer().is() )
{
sal_Bool bVis = maComponentInfos.bVisible;
bool bVis = maComponentInfos.bVisible;
if( bVis )
UnoControl::setVisible( sal_False );

28
toolkit/source/controls/unocontrolmodel.cxx
View File

@ -145,7 +145,7 @@ UnoControlModel::UnoControlModel( const UnoControlModel& rModel )
return aIDs;
}
sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
{
if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
@ -274,7 +274,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
case BASEPROPERTY_PAINTTRANSPARENT:
case BASEPROPERTY_DESKTOP_AS_PARENT:
case BASEPROPERTY_HARDLINEBREAKS:
case BASEPROPERTY_NOLABEL: aDefault <<= (sal_Bool) sal_False; break;
case BASEPROPERTY_NOLABEL: aDefault <<= false; break;
case BASEPROPERTY_MULTISELECTION_SIMPLEMODE:
case BASEPROPERTY_HIDEINACTIVESELECTION:
@ -284,7 +284,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
case BASEPROPERTY_ENABLED:
case BASEPROPERTY_PRINTABLE:
case BASEPROPERTY_ENABLEVISIBLE:
case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
case BASEPROPERTY_DECORATION: aDefault <<= true; break;
case BASEPROPERTY_GROUPNAME:
case BASEPROPERTY_HELPTEXT:
@ -555,7 +555,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
const ::com::sun::star::uno::Any* pProp = &(maData[*it]);
OutStream->writeShort( *it );
sal_Bool bVoid = pProp->getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
bool bVoid = pProp->getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
OutStream->writeBoolean( bVoid );
@ -566,7 +566,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun:
if ( rType == ::getBooleanCppuType() )
{
sal_Bool b = false;
bool b = false;
rValue >>= b;
OutStream->writeBoolean( b );
}
@ -766,7 +766,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
sal_uInt32 nProps = (sal_uInt32)InStream->readLong();
::com::sun::star::uno::Sequence< OUString> aProps( nProps );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValues( nProps );
sal_Bool bInvalidEntries = sal_False;
bool bInvalidEntries = false;
// Unfortunately, there's no mark for the whole block, thus only properties may be changed.
// No data for the model may be added following the properties
@ -783,7 +783,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
sal_uInt16 nPropId = (sal_uInt16)InStream->readShort();
::com::sun::star::uno::Any aValue;
sal_Bool bIsVoid = InStream->readBoolean();
bool bIsVoid = InStream->readBoolean();
if ( !bIsVoid )
{
if ( maData.find( nPropId ) != maData.end() )
@ -791,7 +791,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
const ::com::sun::star::uno::Type* pType = GetPropertyType( nPropId );
if ( *pType == ::getBooleanCppuType() )
{
sal_Bool b = InStream->readBoolean();
bool b = InStream->readBoolean();
aValue <<= b;
}
else if ( *pType == ::getCppuType((const OUString*)0) )
@ -981,7 +981,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
}
else
{
bInvalidEntries = sal_True;
bInvalidEntries = true;
}
// Skip rest of input if there is more data in stream than this version can handle
@ -1042,13 +1042,13 @@ sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(
template <class TYPE>
sal_Bool convertType(Any& _rConvertedValue, const Any& _rNewValueTest, const TYPE* /* _pTypeDisambiguation */)
bool convertType(Any& _rConvertedValue, const Any& _rNewValueTest, const TYPE* /* _pTypeDisambiguation */)
{
TYPE tValue;
if (_rNewValueTest >>= tValue)
{
_rConvertedValue <<= tValue;
return sal_True;
return true;
}
}
@ -1057,7 +1057,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
sal_Bool bVoid = rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
bool bVoid = rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
if ( bVoid )
{
rConvertedValue.clear();
@ -1077,7 +1077,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
}
else
{
sal_Bool bConverted = sal_False;
bool bConverted = false;
// 13.03.2001 - 84923 - frank.schoenheit@germany.sun.com
switch (pDestType->getTypeClass())
@ -1139,7 +1139,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
rConvertedValue = xPure->queryInterface( *pDestType );
else
rConvertedValue.setValue( NULL, *pDestType );
bConverted = sal_True;
bConverted = true;
}
}
break;

168
toolkit/source/controls/unocontrols.cxx
View File

@ -183,14 +183,14 @@ UnoEditControl::UnoEditControl()
:UnoControlBase()
,maTextListeners( *this )
,mnMaxTextLen( 0 )
,mbSetTextInPeer( sal_False )
,mbSetMaxTextLenInPeer( sal_False )
,mbHasTextProperty( sal_False )
,mbSetTextInPeer( false )
,mbSetMaxTextLenInPeer( false )
,mbHasTextProperty( false )
{
maComponentInfos.nWidth = 100;
maComponentInfos.nHeight = 12;
mnMaxTextLen = 0;
mbSetMaxTextLenInPeer = sal_False;
mbSetMaxTextLenInPeer = false;
}
uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
@ -225,7 +225,7 @@ OUString UnoEditControl::GetComponentServiceName()
// but maybe we are to display multi-line text?
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
sal_Bool b = sal_Bool();
bool b = bool();
if ( ( aVal >>= b ) && b )
sName = "MultiLineEdit";
@ -234,14 +234,14 @@ OUString UnoEditControl::GetComponentServiceName()
sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException )
{
sal_Bool bReturn = UnoControlBase::setModel( _rModel );
bool bReturn = UnoControlBase::setModel( _rModel );
mbHasTextProperty = ImplHasProperty( BASEPROPERTY_TEXT );
return bReturn;
}
void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
{
sal_Bool bDone = sal_False;
bool bDone = false;
if ( GetPropertyId( rPropName ) == BASEPROPERTY_TEXT )
{
// #96986# use setText(), or text listener will not be called.
@ -252,7 +252,7 @@ void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno::
rVal >>= sText;
ImplCheckLocalize( sText );
xTextComponent->setText( sText );
bDone = sal_True;
bDone = true;
}
}
@ -291,7 +291,7 @@ void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeExce
{
uno::Any aAny;
aAny <<= xText->getText();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TEXT ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TEXT ), aAny, false );
}
else
{
@ -318,12 +318,12 @@ void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeExceptio
{
uno::Any aAny;
aAny <<= aText;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TEXT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TEXT ), aAny, true );
}
else
{
maText = aText;
mbSetTextInPeer = sal_True;
mbSetTextInPeer = true;
uno::Reference < awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
if ( xText.is() )
xText->setText( maText );
@ -424,8 +424,8 @@ sal_Bool UnoEditControl::isEditable( void ) throw(uno::RuntimeException)
void UnoEditControl::setEditable( sal_Bool bEditable ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= (sal_Bool)!bEditable;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_READONLY ), aAny, sal_True );
aAny <<= !bEditable;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_READONLY ), aAny, true );
}
sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException)
@ -444,12 +444,12 @@ void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException
{
uno::Any aAny;
aAny <<= (sal_Int16)nLen;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MAXTEXTLEN ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MAXTEXTLEN ), aAny, true );
}
else
{
mnMaxTextLen = nLen;
mbSetMaxTextLenInPeer = sal_True;
mbSetMaxTextLenInPeer = true;
uno::Reference < awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
if ( xText.is() )
xText->setMaxTextLen( mnMaxTextLen );
@ -691,11 +691,11 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlButton ) );
case BASEPROPERTY_TOGGLE:
return uno::makeAny( (sal_Bool)sal_False );
return uno::makeAny( false );
case BASEPROPERTY_ALIGN:
return uno::makeAny( (sal_Int16)PROPERTY_ALIGN_CENTER );
case BASEPROPERTY_FOCUSONCLICK:
return uno::makeAny( (sal_Bool)sal_True );
return uno::makeAny( true );
}
return GraphicControlModel::ImplGetDefaultValue( nPropId );
@ -827,7 +827,7 @@ void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
// forward to model
uno::Any aAny;
aAny <<= (sal_Int16)rEvent.Selected;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, false );
// multiplex
ItemEvent aEvent( rEvent );
@ -839,7 +839,7 @@ void UnoButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= rLabel;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true );
}
void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException)
@ -934,7 +934,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
mbAdjustingImageScaleMode = true;
sal_Int16 nScaleMode( awt::ImageScaleMode::ANISOTROPIC );
OSL_VERIFY( _rValue >>= nScaleMode );
setDependentFastPropertyValue( BASEPROPERTY_SCALEIMAGE, uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::NONE ) ) );
setDependentFastPropertyValue( BASEPROPERTY_SCALEIMAGE, uno::makeAny( nScaleMode != awt::ImageScaleMode::NONE ) );
mbAdjustingImageScaleMode = false;
}
break;
@ -942,7 +942,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
if ( !mbAdjustingImageScaleMode && ImplHasProperty( BASEPROPERTY_IMAGE_SCALE_MODE ) )
{
mbAdjustingImageScaleMode = true;
sal_Bool bScale = sal_True;
bool bScale = true;
OSL_VERIFY( _rValue >>= bScale );
setDependentFastPropertyValue( BASEPROPERTY_IMAGE_SCALE_MODE, uno::makeAny( bScale ? awt::ImageScaleMode::ANISOTROPIC : awt::ImageScaleMode::NONE ) );
mbAdjustingImageScaleMode = false;
@ -1157,7 +1157,7 @@ void UnoRadioButtonControl::setLabel( const OUString& rLabel ) throw(uno::Runti
{
uno::Any aAny;
aAny <<= rLabel;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true );
}
void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException)
@ -1175,7 +1175,7 @@ void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException
sal_Int16 nState = bOn ? 1 : 0;
uno::Any aAny;
aAny <<= nState;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, true );
}
sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException)
@ -1190,7 +1190,7 @@ void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) thr
{
uno::Any aAny;
aAny <<= (sal_Int16)rEvent.Selected;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, false );
// compatibility:
// in OOo 1.0.x, when the user clicked a radio button in a group of buttons, this resulted
@ -1383,14 +1383,14 @@ void UnoCheckBoxControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeE
{
uno::Any aAny;
aAny <<= rLabel;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true );
}
void UnoCheckBoxControl::setState( short n ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= (sal_Int16)n;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, true );
}
short UnoCheckBoxControl::getState() throw(uno::RuntimeException)
@ -1405,14 +1405,14 @@ void UnoCheckBoxControl::enableTriState( sal_Bool b ) throw(uno::RuntimeExceptio
{
uno::Any aAny;
aAny <<= b;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TRISTATE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TRISTATE ), aAny, true );
}
void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= (sal_Int16)rEvent.Selected;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, false );
if ( maItemListeners.getLength() )
maItemListeners.itemStateChanged( rEvent );
@ -1546,7 +1546,7 @@ void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::Runtim
{
uno::Any aAny;
aAny <<= Text;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true );
}
OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException)
@ -1558,7 +1558,7 @@ void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(::com::sun::s
{
uno::Any aAny;
aAny <<= URL;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), aAny, true );
}
OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException)
@ -1570,7 +1570,7 @@ void UnoFixedHyperlinkControl::setAlignment( short nAlign ) throw(uno::RuntimeEx
{
uno::Any aAny;
aAny <<= (sal_Int16)nAlign;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, true );
}
short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException)
@ -1742,7 +1742,7 @@ void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeExce
{
uno::Any aAny;
aAny <<= Text;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true );
}
OUString UnoFixedTextControl::getText() throw(uno::RuntimeException)
@ -1754,7 +1754,7 @@ void UnoFixedTextControl::setAlignment( short nAlign ) throw(uno::RuntimeExcepti
{
uno::Any aAny;
aAny <<= (sal_Int16)nAlign;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, true );
}
short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException)
@ -2470,7 +2470,7 @@ void UnoListBoxControl::ImplUpdateSelectedItemsProperty()
uno::Sequence<sal_Int16> aSeq = xListBox->getSelectedItemsPos();
uno::Any aAny;
aAny <<= aSeq;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SELECTEDITEMS ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SELECTEDITEMS ), aAny, false );
}
}
@ -2581,7 +2581,7 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In
uno::Any aAny;
aAny <<= aNewSeq;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true );
}
void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException)
@ -2612,7 +2612,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un
uno::Any aAny;
aAny <<= aNewSeq;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true );
}
}
@ -2730,7 +2730,7 @@ void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::Runt
{
uno::Any aAny;
aAny <<= (sal_Int16)nLines;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, true );
}
sal_Int16 UnoListBoxControl::getDropDownLineCount() throw(uno::RuntimeException)
@ -2747,7 +2747,7 @@ void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= bMulti;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTISELECTION ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTISELECTION ), aAny, true );
}
void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException)
@ -3188,7 +3188,7 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I
uno::Any aAny;
aAny <<= aNewSeq;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true );
}
void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException)
@ -3219,7 +3219,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u
uno::Any aAny;
aAny <<= aNewSeq;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true );
}
}
@ -3254,7 +3254,7 @@ void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::Run
{
uno::Any aAny;
aAny <<= nLines;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, true );
}
sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException)
@ -3277,7 +3277,7 @@ UnoSpinFieldControl::UnoSpinFieldControl()
:UnoEditControl()
,maSpinListeners( *this )
{
mbRepeat = sal_False;
mbRepeat = false;
}
// uno::XInterface
@ -3422,7 +3422,7 @@ UnoDateFieldControl::UnoDateFieldControl()
{
mnFirst = util::Date( 1, 1, 1900 );
mnLast = util::Date( 31, 12, 2200 );
mbLongFormat = 2;
mbLongFormat = AUTO_STATE_AUTO;
}
OUString UnoDateFieldControl::GetComponentServiceName()
@ -3451,7 +3451,7 @@ void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx
uno::Reference < awt::XDateField > xField( getPeer(), uno::UNO_QUERY );
xField->setFirst( mnFirst );
xField->setLast( mnLast );
if ( mbLongFormat != 2 ) // not set
if ( mbLongFormat != AUTO_STATE_AUTO ) // not set
xField->setLongFormat( mbLongFormat );
}
@ -3464,7 +3464,7 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
if ( xPeer.is() )
{
OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), sal_False );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), false );
}
// re-calc the Date property
@ -3473,7 +3473,7 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
if ( xField->isEmpty() )
{
// the field says it's empty
sal_Bool bEnforceFormat = sal_True;
bool bEnforceFormat = true;
if ( xPeer.is() )
xPeer->getProperty( GetPropertyName( BASEPROPERTY_ENFORCE_FORMAT ) ) >>= bEnforceFormat;
if ( !bEnforceFormat )
@ -3490,7 +3490,7 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
else
aValue <<= xField->getDate();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), aValue, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), aValue, false );
// multiplex the event
if ( GetTextListeners().getLength() )
@ -3501,7 +3501,7 @@ void UnoDateFieldControl::setDate( const util::Date& Date ) throw(uno::RuntimeEx
{
uno::Any aAny;
aAny <<= Date;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), aAny, true );
}
util::Date UnoDateFieldControl::getDate() throw(uno::RuntimeException)
@ -3513,7 +3513,7 @@ void UnoDateFieldControl::setMin( const util::Date& Date ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= Date;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMIN ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMIN ), aAny, true );
}
util::Date UnoDateFieldControl::getMin() throw(uno::RuntimeException)
@ -3525,7 +3525,7 @@ void UnoDateFieldControl::setMax( const util::Date& Date ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= Date;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMAX ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMAX ), aAny, true );
}
util::Date UnoDateFieldControl::getMax() throw(uno::RuntimeException)
@ -3565,7 +3565,7 @@ util::Date UnoDateFieldControl::getLast() throw(uno::RuntimeException)
void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeException)
{
mbLongFormat = bLong;
mbLongFormat = bLong ? AUTO_STATE_ON : AUTO_STATE_OFF;
if ( getPeer().is() )
{
uno::Reference < awt::XDateField > xField( getPeer(), uno::UNO_QUERY );
@ -3575,7 +3575,7 @@ void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeExce
sal_Bool UnoDateFieldControl::isLongFormat() throw(uno::RuntimeException)
{
return ( mbLongFormat != 2 ) ? mbLongFormat : sal_False;
return ( mbLongFormat != AUTO_STATE_AUTO ) ? mbLongFormat : sal_False;
}
void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException)
@ -3589,7 +3589,7 @@ void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException)
sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException)
{
sal_Bool bEmpty = sal_False;
bool bEmpty = false;
if ( getPeer().is() )
{
uno::Reference < awt::XDateField > xField( getPeer(), uno::UNO_QUERY );
@ -3602,7 +3602,7 @@ void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::Runtime
{
uno::Any aAny;
aAny <<= bStrict;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true );
}
sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException)
@ -3713,14 +3713,14 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
// also change the text property (#i25106#)
uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY );
OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), sal_False );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), false );
// re-calc the Time property
uno::Reference < awt::XTimeField > xField( getPeer(), uno::UNO_QUERY );
uno::Any aValue;
if ( !xField->isEmpty() )
aValue <<= xField->getTime();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), aValue, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), aValue, false );
// multiplex the event
if ( GetTextListeners().getLength() )
@ -3731,7 +3731,7 @@ void UnoTimeFieldControl::setTime( const util::Time& Time ) throw(uno::RuntimeEx
{
uno::Any aAny;
aAny <<= Time;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), aAny, true );
}
util::Time UnoTimeFieldControl::getTime() throw(uno::RuntimeException)
@ -3743,7 +3743,7 @@ void UnoTimeFieldControl::setMin( const util::Time& Time ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= Time;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMIN ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMIN ), aAny, true );
}
util::Time UnoTimeFieldControl::getMin() throw(uno::RuntimeException)
@ -3755,7 +3755,7 @@ void UnoTimeFieldControl::setMax( const util::Time& Time ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= Time;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMAX ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMAX ), aAny, true );
}
util::Time UnoTimeFieldControl::getMax() throw(uno::RuntimeException)
@ -3804,7 +3804,7 @@ void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException)
sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException)
{
sal_Bool bEmpty = sal_False;
bool bEmpty = false;
if ( getPeer().is() )
{
uno::Reference < awt::XTimeField > xField( getPeer(), uno::UNO_QUERY );
@ -3817,7 +3817,7 @@ void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::Runtime
{
uno::Any aAny;
aAny <<= bStrict;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true );
}
sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException)
@ -3929,7 +3929,7 @@ void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::R
uno::Reference < awt::XNumericField > xField( getPeer(), uno::UNO_QUERY );
uno::Any aAny;
aAny <<= xField->getValue();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, false );
if ( GetTextListeners().getLength() )
GetTextListeners().textChanged( e );
@ -3939,7 +3939,7 @@ void UnoNumericFieldControl::setValue( double Value ) throw(uno::RuntimeExceptio
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, true );
}
double UnoNumericFieldControl::getValue() throw(uno::RuntimeException)
@ -3951,7 +3951,7 @@ void UnoNumericFieldControl::setMin( double Value ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, true );
}
double UnoNumericFieldControl::getMin() throw(uno::RuntimeException)
@ -3963,7 +3963,7 @@ void UnoNumericFieldControl::setMax( double Value ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, true );
}
double UnoNumericFieldControl::getMax() throw(uno::RuntimeException)
@ -4005,7 +4005,7 @@ void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::Runt
{
uno::Any aAny;
aAny <<= bStrict;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true );
}
sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException)
@ -4017,7 +4017,7 @@ void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeExce
{
uno::Any aAny;
aAny <<= Digits;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, true );
}
double UnoNumericFieldControl::getSpinSize() throw(uno::RuntimeException)
@ -4029,7 +4029,7 @@ void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::Run
{
uno::Any aAny;
aAny <<= Digits;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, true );
}
sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException)
@ -4070,7 +4070,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
if ( nPropId == BASEPROPERTY_CURSYM_POSITION )
{
uno::Any aAny;
aAny <<= (sal_Bool)sal_False;
aAny <<= false;
return aAny;
}
@ -4146,7 +4146,7 @@ void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::
uno::Reference < awt::XCurrencyField > xField( getPeer(), uno::UNO_QUERY );
uno::Any aAny;
aAny <<= xField->getValue();
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, sal_False );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, false );
if ( GetTextListeners().getLength() )
GetTextListeners().textChanged( e );
@ -4156,7 +4156,7 @@ void UnoCurrencyFieldControl::setValue( double Value ) throw(uno::RuntimeExcepti
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, true );
}
double UnoCurrencyFieldControl::getValue() throw(uno::RuntimeException)
@ -4168,7 +4168,7 @@ void UnoCurrencyFieldControl::setMin( double Value ) throw(uno::RuntimeException
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, true );
}
double UnoCurrencyFieldControl::getMin() throw(uno::RuntimeException)
@ -4180,7 +4180,7 @@ void UnoCurrencyFieldControl::setMax( double Value ) throw(uno::RuntimeException
{
uno::Any aAny;
aAny <<= Value;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, true );
}
double UnoCurrencyFieldControl::getMax() throw(uno::RuntimeException)
@ -4222,7 +4222,7 @@ void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::Run
{
uno::Any aAny;
aAny <<= bStrict;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true );
}
sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException)
@ -4234,7 +4234,7 @@ void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeExc
{
uno::Any aAny;
aAny <<= Digits;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, true );
}
double UnoCurrencyFieldControl::getSpinSize() throw(uno::RuntimeException)
@ -4246,7 +4246,7 @@ void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::Ru
{
uno::Any aAny;
aAny <<= Digits;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, true );
}
sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeException)
@ -4379,9 +4379,9 @@ void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString&
{
uno::Any aAny;
aAny <<= EditMask;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_EDITMASK ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_EDITMASK ), aAny, true );
aAny <<= LiteralMask;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), aAny, true );
}
void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException)
@ -4394,7 +4394,7 @@ void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::Runt
{
uno::Any aAny;
aAny <<= bStrict;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true );
}
sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException)
@ -4506,21 +4506,21 @@ void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(::com::
{
uno::Any aAny;
aAny <<= nColor;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), aAny, true );
}
void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aAny;
aAny <<= nColor;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), aAny, true );
}
void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aAny;
aAny <<= nValue;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), aAny, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), aAny, true );
}
void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException )
@ -4541,8 +4541,8 @@ void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::c
aMax <<= nMin;
}
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MIN ), aMin, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, sal_True );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MIN ), aMin, true );
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, true );
}
sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::RuntimeException)

2
toolkit/source/helper/formpdfexport.cxx
View File

@ -354,7 +354,7 @@ namespace toolkitform
static const OUString FM_PROP_MULTILINE("MultiLine");
if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) )
{
sal_Bool bMultiLine = sal_False;
bool bMultiLine = false;
OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_MULTILINE ) >>= bMultiLine );
if ( bMultiLine )
_rpDescriptor->TextStyle |= TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK;

18
toolkit/source/helper/property.cxx
View File

@ -65,17 +65,17 @@ struct ImplPropertyInfo
sal_uInt16 nPropId;
::com::sun::star::uno::Type aType;
sal_Int16 nAttribs;
sal_Bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
ImplPropertyInfo()
{
nPropId = 0;
nAttribs = 0;
bDependsOnOthers = sal_False;
bDependsOnOthers = false;
}
ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
sal_Int16 nAttrs, sal_Bool bDepends = sal_False )
sal_Int16 nAttrs, bool bDepends = false )
: aName( theName )
{
nPropId = nId;
@ -94,9 +94,9 @@ struct ImplPropertyInfo
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
#define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, sal_True )
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
#define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, sal_True )
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
{
@ -319,13 +319,13 @@ struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,
void ImplAssertValidPropertyArray()
{
static sal_Bool bSorted = sal_False;
static bool bSorted = false;
if( !bSorted )
{
sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
::std::sort(pInfos, pInfos+nElements,ImplPropertyInfoCompareFunctor());
bSorted = sal_True;
bSorted = true;
}
}
@ -392,14 +392,14 @@ sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId )
return pImplPropertyInfo ? pImplPropertyInfo->nAttribs : 0;
}
sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId )
bool DoesDependOnOthers( sal_uInt16 nPropertyId )
{
const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId );
DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" );
return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : sal_False;
}
sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
{
return ::comphelper::compare( r1, r2 );
}

4
toolkit/source/helper/unopropertyarrayhelper.cxx
View File

@ -41,7 +41,7 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list< sal_uInt16 > &r
maIDs.insert( *iter );
}
sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
{
if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
@ -53,7 +53,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nPropId )
{
sal_uInt16 id = sal::static_int_cast< sal_uInt16 >(nPropId);
sal_Bool bValid = ImplHasProperty( id );
bool bValid = ImplHasProperty( id );
if ( bValid )
{
if ( pPropName )

2
toolkit/source/helper/unowrapper.cxx
View File

@ -205,7 +205,7 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
}
static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
static bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
{
Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;
while ( pWindow && ( pWindow != pParentWindow ) )

2
toolkit/source/helper/vclunohelper.cxx
View File

@ -385,7 +385,7 @@ Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::com::su
return aFM;
}
sal_Bool VCLUnoHelper::IsZero( ::com::sun::star::awt::Rectangle rRect )
bool VCLUnoHelper::IsZero( ::com::sun::star::awt::Rectangle rRect )
{
return ( !rRect.X && !rRect.Y && !rRect.Width && !rRect.Height );
}