Kaydet (Commit) caf8f777 authored tarafından Noel Grandin's avatar Noel Grandin

svx: sal_Bool->bool

Change-Id: I41f3935a468f38c59bfbce7096bb086daf6190a3
üst 5e36e2cb
...@@ -283,7 +283,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) ...@@ -283,7 +283,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
m_pCtlPosition->Reset(); m_pCtlPosition->Reset();
m_pCtlPosition->SetState(TRISTATE_INDET); m_pCtlPosition->SetState(TRISTATE_INDET);
m_pCtlPosition->DoCompletelyDisable(sal_True); m_pCtlPosition->DoCompletelyDisable(true);
m_pTsbFullWidth->SetState(TRISTATE_INDET); m_pTsbFullWidth->SetState(TRISTATE_INDET);
m_pFlPosition->Enable( false ); m_pFlPosition->Enable( false );
......
...@@ -343,7 +343,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) ...@@ -343,7 +343,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
if(bIs8x8) if(bIs8x8)
{ {
m_pCtlPixel->SetPaintable( sal_True ); m_pCtlPixel->SetPaintable( true );
m_pBxPixelEditor->Enable(); m_pBxPixelEditor->Enable();
m_pBtnModify->Enable(); m_pBtnModify->Enable();
m_pBtnAdd->Enable(); m_pBtnAdd->Enable();
...@@ -393,7 +393,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) ...@@ -393,7 +393,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
else else
{ {
m_pCtlPixel->Reset(); m_pCtlPixel->Reset();
m_pCtlPixel->SetPaintable( sal_False ); m_pCtlPixel->SetPaintable( false );
m_pBxPixelEditor->Disable(); m_pBxPixelEditor->Disable();
m_pBtnModify->Disable(); m_pBtnModify->Disable();
m_pBtnAdd->Disable(); m_pBtnAdd->Disable();
......
...@@ -92,10 +92,10 @@ namespace svx ...@@ -92,10 +92,10 @@ namespace svx
*/ */
void initializeFrom( void initializeFrom(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues,
sal_Bool _bClear = sal_True); bool _bClear = true);
/// checks whether or not a given property is present in the descriptor /// checks whether or not a given property is present in the descriptor
sal_Bool has(DataAccessDescriptorProperty _eWhich) const; bool has(DataAccessDescriptorProperty _eWhich) const;
/** erases the given property from the descriptor /** erases the given property from the descriptor
*/ */
......
...@@ -113,11 +113,11 @@ namespace svx ...@@ -113,11 +113,11 @@ namespace svx
@param _nFormats @param _nFormats
formats to accept formats to accept
*/ */
static sal_Bool canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats); static bool canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats);
/** extracts a column descriptor from the transferable given /** extracts a column descriptor from the transferable given
*/ */
static sal_Bool extractColumnDescriptor( static bool extractColumnDescriptor(
const TransferableDataHelper& _rData const TransferableDataHelper& _rData
,OUString& _rDatasource ,OUString& _rDatasource
,OUString& _rDatabaseLocation ,OUString& _rDatabaseLocation
...@@ -216,7 +216,7 @@ namespace svx ...@@ -216,7 +216,7 @@ namespace svx
@param _nFormats @param _nFormats
formats to accept formats to accept
*/ */
static sal_Bool canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors); static bool canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors);
/** extracts a object descriptor from the transferable given /** extracts a object descriptor from the transferable given
*/ */
...@@ -245,7 +245,7 @@ namespace svx ...@@ -245,7 +245,7 @@ namespace svx
,const sal_Int32 _nCommandType ,const sal_Int32 _nCommandType
,const OUString& _rCommand ,const OUString& _rCommand
,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
,sal_Bool _bAddCommand ,bool _bAddCommand
,const OUString& _sActiveCommand); ,const OUString& _sActiveCommand);
}; };
...@@ -267,7 +267,7 @@ namespace svx ...@@ -267,7 +267,7 @@ namespace svx
@param _nFormats @param _nFormats
formats to accept formats to accept
*/ */
static sal_Bool canExtractDescriptor(const DataFlavorExVector& _rFlavors); static bool canExtractDescriptor(const DataFlavorExVector& _rFlavors);
/** extracts a object descriptor from the transferable given /** extracts a object descriptor from the transferable given
*/ */
......
...@@ -53,7 +53,7 @@ namespace svx ...@@ -53,7 +53,7 @@ namespace svx
@param _rFlavors @param _rFlavors
available flavors available flavors
*/ */
static sal_Bool canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors,sal_Bool _bForm ); static bool canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors, bool _bForm );
/** extracts a component descriptor from the transferable given /** extracts a component descriptor from the transferable given
*/ */
...@@ -65,7 +65,7 @@ namespace svx ...@@ -65,7 +65,7 @@ namespace svx
virtual void AddSupportedFormats(); virtual void AddSupportedFormats();
virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
static sal_uInt32 getDescriptorFormatId(sal_Bool _bExtractForm); static sal_uInt32 getDescriptorFormatId(bool _bExtractForm);
}; };
......
...@@ -42,7 +42,7 @@ namespace svxform ...@@ -42,7 +42,7 @@ namespace svxform
static ::connectivity::simple::createDataAccessToolsFactoryFunction static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc; s_pFactoryCreationFunc;
mutable sal_Bool m_bCreateAlready; mutable bool m_bCreateAlready;
private: private:
mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory; mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
...@@ -128,12 +128,12 @@ namespace svxform ...@@ -128,12 +128,12 @@ namespace svxform
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
@param _rxCursorSet the property set @param _rxCursorSet the property set
*/ */
sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
@param _rxCursorSet the property set @param _rxCursorSet the property set
*/ */
sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const; bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
getFieldsByCommandDescriptor( getFieldsByCommandDescriptor(
......
...@@ -36,14 +36,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes ...@@ -36,14 +36,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes
private: private:
// Compound object // Compound object
Color aDefaultAmbientColor; Color aDefaultAmbientColor;
sal_Bool bDefaultCreateNormals; bool bDefaultCreateNormals;
sal_Bool bDefaultCreateTexture; bool bDefaultCreateTexture;
// Cube object // Cube object
basegfx::B3DPoint aDefaultCubePos; basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize; basegfx::B3DVector aDefaultCubeSize;
sal_uInt16 nDefaultCubeSideFlags; sal_uInt16 nDefaultCubeSideFlags;
sal_Bool bDefaultCubePosIsCenter; bool bDefaultCubePosIsCenter;
// Sphere object // Sphere object
basegfx::B3DPoint aDefaultSphereCenter; basegfx::B3DPoint aDefaultSphereCenter;
...@@ -51,18 +51,18 @@ private: ...@@ -51,18 +51,18 @@ private:
// Lathe object // Lathe object
long nDefaultLatheEndAngle; long nDefaultLatheEndAngle;
sal_Bool bDefaultLatheSmoothed; bool bDefaultLatheSmoothed;
sal_Bool bDefaultLatheSmoothFrontBack; bool bDefaultLatheSmoothFrontBack;
sal_Bool bDefaultLatheCharacterMode; bool bDefaultLatheCharacterMode;
sal_Bool bDefaultLatheCloseFront; bool bDefaultLatheCloseFront;
sal_Bool bDefaultLatheCloseBack; bool bDefaultLatheCloseBack;
// Extrude object // Extrude object
sal_Bool bDefaultExtrudeSmoothed; bool bDefaultExtrudeSmoothed;
sal_Bool bDefaultExtrudeSmoothFrontBack; bool bDefaultExtrudeSmoothFrontBack;
sal_Bool bDefaultExtrudeCharacterMode; bool bDefaultExtrudeCharacterMode;
sal_Bool bDefaultExtrudeCloseFront; bool bDefaultExtrudeCloseFront;
sal_Bool bDefaultExtrudeCloseBack; bool bDefaultExtrudeCloseBack;
public: public:
// Construktor // Construktor
...@@ -76,10 +76,10 @@ public: ...@@ -76,10 +76,10 @@ public:
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; } void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; } bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; } void SetDefaultCreateNormals(const bool bNew) { bDefaultCreateNormals = bNew; }
sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; } bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; } void SetDefaultCreateTexture(const bool bNew) { bDefaultCreateTexture = bNew; }
// Cube object // Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
...@@ -88,8 +88,8 @@ public: ...@@ -88,8 +88,8 @@ public:
void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; } void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; } void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; } void SetDefaultCubePosIsCenter(const bool bNew) { bDefaultCubePosIsCenter = bNew; }
// Sphere object // Sphere object
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; } const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
...@@ -100,28 +100,28 @@ public: ...@@ -100,28 +100,28 @@ public:
// Lathe object // Lathe object
long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; } void SetDefaultLatheSmoothed(const bool bNew) { bDefaultLatheSmoothed = bNew; }
sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; } void SetDefaultLatheSmoothFrontBack(const bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; } void SetDefaultLatheCharacterMode(const bool bNew) { bDefaultLatheCharacterMode = bNew; }
sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; } void SetDefaultLatheCloseFront(const bool bNew) { bDefaultLatheCloseFront = bNew; }
sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; } void SetDefaultLatheCloseBack(const bool bNew) { bDefaultLatheCloseBack = bNew; }
// Extrude object // Extrude object
sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; } void SetDefaultExtrudeSmoothed(const bool bNew) { bDefaultExtrudeSmoothed = bNew; }
sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } void SetDefaultExtrudeSmoothFrontBack(const bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; } void SetDefaultExtrudeCharacterMode(const bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; } void SetDefaultExtrudeCloseFront(const bool bNew) { bDefaultExtrudeCloseFront = bNew; }
sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; } void SetDefaultExtrudeCloseBack(const bool bNew) { bDefaultExtrudeCloseBack = bNew; }
}; };
#endif // INCLUDED_SVX_DEFLT3D_HXX #endif // INCLUDED_SVX_DEFLT3D_HXX
......
...@@ -68,7 +68,7 @@ class SvxPixelCtlAccessible; ...@@ -68,7 +68,7 @@ class SvxPixelCtlAccessible;
class SVX_DLLPUBLIC SvxRectCtl : public Control class SVX_DLLPUBLIC SvxRectCtl : public Control
{ {
private: private:
SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); SVX_DLLPRIVATE void InitSettings( bool bForeground, bool bBackground );
SVX_DLLPRIVATE void InitRectBitmap( void ); SVX_DLLPRIVATE void InitRectBitmap( void );
SVX_DLLPRIVATE Bitmap& GetRectBitmap( void ); SVX_DLLPRIVATE Bitmap& GetRectBitmap( void );
SVX_DLLPRIVATE void Resize_Impl(); SVX_DLLPRIVATE void Resize_Impl();
...@@ -87,7 +87,7 @@ protected: ...@@ -87,7 +87,7 @@ protected:
Bitmap* pBitmap; Bitmap* pBitmap;
CTL_STATE m_nState; CTL_STATE m_nState;
sal_Bool mbCompleteDisable; bool mbCompleteDisable;
RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const; RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const;
Point GetPointFromRP( RECT_POINT ) const; Point GetPointFromRP( RECT_POINT ) const;
...@@ -128,8 +128,8 @@ public: ...@@ -128,8 +128,8 @@ public:
RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const; RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const;
sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; } bool IsCompletelyDisabled() const { return mbCompleteDisable; }
void DoCompletelyDisable(sal_Bool bNew); void DoCompletelyDisable(bool bNew);
void SetCS(CTL_STYLE eNew); void SetCS(CTL_STYLE eNew);
}; };
...@@ -172,8 +172,8 @@ protected: ...@@ -172,8 +172,8 @@ protected:
Color aBackgroundColor; Color aBackgroundColor;
Color aLineColor; Color aLineColor;
Size aRectSize; Size aRectSize;
sal_uInt16* pPixel; sal_uInt16* pPixel;
sal_Bool bPaintable; bool bPaintable;
//Add member identifying position //Add member identifying position
Point aFocusPosition; Point aFocusPosition;
Rectangle implCalFocusRect( const Point& aPosition ); Rectangle implCalFocusRect( const Point& aPosition );
...@@ -202,7 +202,7 @@ public: ...@@ -202,7 +202,7 @@ public:
sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber ); sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber );
sal_uInt16* GetBitmapPixelPtr() { return pPixel; } sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; } void SetPaintable( bool bTmp ) { bPaintable = bTmp; }
void Reset(); void Reset();
SvxPixelCtlAccessible* m_pAccess; SvxPixelCtlAccessible* m_pAccess;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess;
...@@ -401,7 +401,7 @@ private: ...@@ -401,7 +401,7 @@ private:
SdrPathObj* mpLineObjC; SdrPathObj* mpLineObjC;
Graphic* mpGraphic; Graphic* mpGraphic;
sal_Bool mbWithSymbol; bool mbWithSymbol;
Size maSymbolSize; Size maSymbolSize;
public: public:
...@@ -410,7 +410,7 @@ public: ...@@ -410,7 +410,7 @@ public:
void SetLineAttributes(const SfxItemSet& rItemSet); void SetLineAttributes(const SfxItemSet& rItemSet);
void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; }; void ShowSymbol( bool b ) { mbWithSymbol = b; };
void SetSymbol( Graphic* p, const Size& s ); void SetSymbol( Graphic* p, const Size& s );
void ResizeSymbol( const Size& s ); void ResizeSymbol( const Size& s );
......
...@@ -329,8 +329,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con ...@@ -329,8 +329,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE ); ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE );
// pShape2d Convert in scenes which include 3D Objects // pShape2d Convert in scenes which include 3D Objects
E3dDefaultAttributes a3DDefaultAttr; E3dDefaultAttributes a3DDefaultAttr;
a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True ); a3DDefaultAttr.SetDefaultLatheCharacterMode( true );
a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True ); a3DDefaultAttr.SetDefaultExtrudeCharacterMode( true );
E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr ); E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
......
...@@ -158,7 +158,7 @@ void SvxRectCtl::Resize_Impl() ...@@ -158,7 +158,7 @@ void SvxRectCtl::Resize_Impl()
break; break;
} }
Reset(); Reset();
InitSettings( sal_True, sal_True ); InitSettings( true, true );
} }
...@@ -211,7 +211,7 @@ void SvxRectCtl::InitRectBitmap( void ) ...@@ -211,7 +211,7 @@ void SvxRectCtl::InitRectBitmap( void )
void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) void SvxRectCtl::InitSettings( bool bForeground, bool bBackground )
{ {
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
...@@ -372,9 +372,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) ...@@ -372,9 +372,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
void SvxRectCtl::StateChanged( StateChangedType nType ) void SvxRectCtl::StateChanged( StateChangedType nType )
{ {
if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
InitSettings( sal_True, sal_False ); InitSettings( true, false );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
InitSettings( sal_False, sal_True ); InitSettings( false, true );
Window::StateChanged( nType ); Window::StateChanged( nType );
} }
...@@ -384,7 +384,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) ...@@ -384,7 +384,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
{ {
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
InitSettings( sal_True, sal_True ); InitSettings( true, true );
else else
Window::DataChanged( rDCEvt ); Window::DataChanged( rDCEvt );
} }
...@@ -745,7 +745,7 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& ...@@ -745,7 +745,7 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point&
} }
// CompletelyDisabled() added to have a disabled state for SvxRectCtl // CompletelyDisabled() added to have a disabled state for SvxRectCtl
void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew) void SvxRectCtl::DoCompletelyDisable(bool bNew)
{ {
mbCompleteDisable = bNew; mbCompleteDisable = bNew;
Invalidate(); Invalidate();
......
...@@ -34,14 +34,14 @@ E3dDefaultAttributes::E3dDefaultAttributes() ...@@ -34,14 +34,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
void E3dDefaultAttributes::Reset() void E3dDefaultAttributes::Reset()
{ {
// Compound object // Compound object
bDefaultCreateNormals = sal_True; bDefaultCreateNormals = true;
bDefaultCreateTexture = sal_True; bDefaultCreateTexture = true;
// Cube object // Cube object
aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
nDefaultCubeSideFlags = CUBE_FULL; nDefaultCubeSideFlags = CUBE_FULL;
bDefaultCubePosIsCenter = sal_False; bDefaultCubePosIsCenter = false;
// Sphere object // Sphere object
aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
...@@ -49,18 +49,18 @@ void E3dDefaultAttributes::Reset() ...@@ -49,18 +49,18 @@ void E3dDefaultAttributes::Reset()
// Lathe object // Lathe object
nDefaultLatheEndAngle = 3600; nDefaultLatheEndAngle = 3600;
bDefaultLatheSmoothed = sal_True; bDefaultLatheSmoothed = true;
bDefaultLatheSmoothFrontBack = sal_False; bDefaultLatheSmoothFrontBack = false;
bDefaultLatheCharacterMode = sal_False; bDefaultLatheCharacterMode = false;
bDefaultLatheCloseFront = sal_True; bDefaultLatheCloseFront = true;
bDefaultLatheCloseBack = sal_True; bDefaultLatheCloseBack = true;
// Extrude object // Extrude object
bDefaultExtrudeSmoothed = sal_True; bDefaultExtrudeSmoothed = true;
bDefaultExtrudeSmoothFrontBack = sal_False; bDefaultExtrudeSmoothFrontBack = false;
bDefaultExtrudeCharacterMode = sal_False; bDefaultExtrudeCharacterMode = false;
bDefaultExtrudeCloseFront = sal_True; bDefaultExtrudeCloseFront = true;
bDefaultExtrudeCloseBack = sal_True; bDefaultExtrudeCloseBack = true;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -708,9 +708,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo ...@@ -708,9 +708,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
{ {
E3dDefaultAttributes aDefault = Get3DDefaultAttributes(); E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
if(bExtrude) if(bExtrude)
aDefault.SetDefaultExtrudeCharacterMode(sal_True); aDefault.SetDefaultExtrudeCharacterMode(true);
else else
aDefault.SetDefaultLatheCharacterMode(sal_True); aDefault.SetDefaultLatheCharacterMode(true);
// Get Itemset of the original object // Get Itemset of the original object
SfxItemSet aSet(pObj->GetMergedItemSet()); SfxItemSet aSet(pObj->GetMergedItemSet());
...@@ -725,8 +725,8 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo ...@@ -725,8 +725,8 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
{ {
// This SdrPathObj is not filled, leave the front and rear face out. // This SdrPathObj is not filled, leave the front and rear face out.
// Moreover, a two-sided representation necessary. // Moreover, a two-sided representation necessary.
aDefault.SetDefaultExtrudeCloseFront(sal_False); aDefault.SetDefaultExtrudeCloseFront(false);
aDefault.SetDefaultExtrudeCloseBack(sal_False); aDefault.SetDefaultExtrudeCloseBack(false);
aSet.Put(Svx3DDoubleSidedItem(sal_True)); aSet.Put(Svx3DDoubleSidedItem(sal_True));
......
...@@ -240,25 +240,25 @@ namespace svx ...@@ -240,25 +240,25 @@ namespace svx
} }
sal_Bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats) bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats)
{ {
sal_Bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR); bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR);
sal_Bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE); bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE);
sal_Bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR); bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR);
for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
aCheck != _rFlavors.end(); aCheck != _rFlavors.end();
++aCheck ++aCheck
) )
{ {
if (bFieldFormat && (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == aCheck->mnSotId)) if (bFieldFormat && (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == aCheck->mnSotId))
return sal_True; return true;
if (bControlFormat && (SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == aCheck->mnSotId)) if (bControlFormat && (SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == aCheck->mnSotId))
return sal_True; return true;
if (bDescriptorFormat && (getDescriptorFormatId() == aCheck->mnSotId)) if (bDescriptorFormat && (getDescriptorFormatId() == aCheck->mnSotId))
return sal_True; return true;
} }
return sal_False; return false;
} }
...@@ -313,7 +313,7 @@ namespace svx ...@@ -313,7 +313,7 @@ namespace svx
} }
sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData
,OUString& _rDatasource ,OUString& _rDatasource
,OUString& _rDatabaseLocation ,OUString& _rDatabaseLocation
,OUString& _rConnectionResource ,OUString& _rConnectionResource
...@@ -334,7 +334,7 @@ namespace svx ...@@ -334,7 +334,7 @@ namespace svx
aDescriptor[daCommand] >>= _rCommand; aDescriptor[daCommand] >>= _rCommand;
aDescriptor[daCommandType] >>= _nCommandType; aDescriptor[daCommandType] >>= _nCommandType;
aDescriptor[daColumnName] >>= _rFieldName; aDescriptor[daColumnName] >>= _rFieldName;
return sal_True; return true;
} }
// check if we have a (string) format we can use .... // check if we have a (string) format we can use ....
...@@ -344,7 +344,7 @@ namespace svx ...@@ -344,7 +344,7 @@ namespace svx
if (_rData.HasFormat(SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE)) if (_rData.HasFormat(SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE))
nRecognizedFormat = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE; nRecognizedFormat = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE;
if (!nRecognizedFormat) if (!nRecognizedFormat)
return sal_False; return false;
OUString sFieldDescription; OUString sFieldDescription;
const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription); const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription);
...@@ -355,7 +355,7 @@ namespace svx ...@@ -355,7 +355,7 @@ namespace svx
_nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32(); _nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32();
_rFieldName = sFieldDescription.getToken(3, cSeparator); _rFieldName = sFieldDescription.getToken(3, cSeparator);
return sal_True; return true;
} }
...@@ -486,7 +486,7 @@ namespace svx ...@@ -486,7 +486,7 @@ namespace svx
} }
sal_Bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors) bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors)
{ {
for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
aCheck != _rFlavors.end(); aCheck != _rFlavors.end();
...@@ -494,13 +494,13 @@ namespace svx ...@@ -494,13 +494,13 @@ namespace svx
) )
{ {
if (SOT_FORMATSTR_ID_DBACCESS_TABLE == aCheck->mnSotId) if (SOT_FORMATSTR_ID_DBACCESS_TABLE == aCheck->mnSotId)
return sal_True; return true;
if (SOT_FORMATSTR_ID_DBACCESS_QUERY == aCheck->mnSotId) if (SOT_FORMATSTR_ID_DBACCESS_QUERY == aCheck->mnSotId)
return sal_True; return true;
if (SOT_FORMATSTR_ID_DBACCESS_COMMAND == aCheck->mnSotId) if (SOT_FORMATSTR_ID_DBACCESS_COMMAND == aCheck->mnSotId)
return sal_True; return true;
} }
return sal_False; return false;
} }
...@@ -571,7 +571,7 @@ namespace svx ...@@ -571,7 +571,7 @@ namespace svx
,const sal_Int32 _nCommandType ,const sal_Int32 _nCommandType
,const OUString& _rCommand ,const OUString& _rCommand
,const Reference< XConnection >& _rxConnection ,const Reference< XConnection >& _rxConnection
,sal_Bool _bAddCommand ,bool _bAddCommand
,const OUString& _sActiveCommand) ,const OUString& _sActiveCommand)
{ {
m_aDescriptor.setDataSource(_rDatasource); m_aDescriptor.setDataSource(_rDatasource);
...@@ -656,7 +656,7 @@ namespace svx ...@@ -656,7 +656,7 @@ namespace svx
} }
sal_Bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors) bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors)
{ {
DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
for ( ; for ( ;
......
...@@ -56,7 +56,7 @@ namespace svx ...@@ -56,7 +56,7 @@ namespace svx
sal_uInt32 OComponentTransferable::getDescriptorFormatId(sal_Bool _bExtractForm) sal_uInt32 OComponentTransferable::getDescriptorFormatId(bool _bExtractForm)
{ {
static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; static sal_uInt32 s_nReportFormat = (sal_uInt32)-1;
static sal_uInt32 s_nFormFormat = (sal_uInt32)-1; static sal_uInt32 s_nFormFormat = (sal_uInt32)-1;
...@@ -93,14 +93,14 @@ namespace svx ...@@ -93,14 +93,14 @@ namespace svx
sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor ) sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor )
{ {
const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
if ( nFormatId == getDescriptorFormatId(sal_True) || nFormatId == getDescriptorFormatId(sal_False) ) if ( nFormatId == getDescriptorFormatId(true) || nFormatId == getDescriptorFormatId(false) )
return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor );
return sal_False; return sal_False;
} }
sal_Bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors,sal_Bool _bForm ) bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors, bool _bForm )
{ {
DataFlavorExVector::const_iterator aEnd = _rFlavors.end(); DataFlavorExVector::const_iterator aEnd = _rFlavors.end();
for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
...@@ -109,17 +109,17 @@ namespace svx ...@@ -109,17 +109,17 @@ namespace svx
) )
{ {
if ( getDescriptorFormatId(_bForm) == aCheck->mnSotId ) if ( getDescriptorFormatId(_bForm) == aCheck->mnSotId )
return sal_True; return true;
} }
return sal_False; return false;
} }
ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData) ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData)
{ {
sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(sal_True)); sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(true));
if ( bForm || _rData.HasFormat(getDescriptorFormatId(sal_False)) ) if ( bForm || _rData.HasFormat(getDescriptorFormatId(false)) )
{ {
// the object has a real descriptor object (not just the old compatible format) // the object has a real descriptor object (not just the old compatible format)
......
...@@ -343,7 +343,7 @@ namespace svx ...@@ -343,7 +343,7 @@ namespace svx
} }
sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const
{ {
return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end(); return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end();
} }
...@@ -369,7 +369,7 @@ namespace svx ...@@ -369,7 +369,7 @@ namespace svx
} }
void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear) void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, bool _bClear)
{ {
if (_bClear) if (_bClear)
clear(); clear();
......
...@@ -57,7 +57,7 @@ namespace svxform ...@@ -57,7 +57,7 @@ namespace svxform
ODbtoolsClient::ODbtoolsClient() ODbtoolsClient::ODbtoolsClient()
{ {
m_bCreateAlready = sal_False; m_bCreateAlready = false;
} }
...@@ -264,18 +264,18 @@ namespace svxform ...@@ -264,18 +264,18 @@ namespace svxform
} }
sal_Bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
{ {
sal_Bool bRet = sal_False; bool bRet = false;
if ( ensureLoaded() ) if ( ensureLoaded() )
bRet = m_xDataAccessTools->canInsert( _rxCursorSet ); bRet = m_xDataAccessTools->canInsert( _rxCursorSet );
return bRet; return bRet;
} }
sal_Bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
{ {
sal_Bool bRet = sal_False; bool bRet = false;
if ( ensureLoaded() ) if ( ensureLoaded() )
bRet = m_xDataAccessTools->canUpdate( _rxCursorSet ); bRet = m_xDataAccessTools->canUpdate( _rxCursorSet );
return bRet; return bRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment