summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/textattr.cxx2
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
-rw-r--r--include/svx/dataaccessdescriptor.hxx4
-rw-r--r--include/svx/dbaexchange.hxx10
-rw-r--r--include/svx/dbaobjectex.hxx4
-rw-r--r--include/svx/dbtoolsclient.hxx6
-rw-r--r--include/svx/deflt3d.hxx80
-rw-r--r--include/svx/dlgctrl.hxx18
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
-rw-r--r--svx/source/dialog/dlgctrl.cxx12
-rw-r--r--svx/source/engine3d/deflt3d.cxx26
-rw-r--r--svx/source/engine3d/view3d.cxx8
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx38
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx14
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx4
-rw-r--r--svx/source/form/dbtoolsclient.cxx10
16 files changed, 122 insertions, 122 deletions
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 33d576cf607f..282d00920dba 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -283,7 +283,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
m_pCtlPosition->Reset();
m_pCtlPosition->SetState(TRISTATE_INDET);
- m_pCtlPosition->DoCompletelyDisable(sal_True);
+ m_pCtlPosition->DoCompletelyDisable(true);
m_pTsbFullWidth->SetState(TRISTATE_INDET);
m_pFlPosition->Enable( false );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 9602ab38d91a..94761f559c64 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -343,7 +343,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
if(bIs8x8)
{
- m_pCtlPixel->SetPaintable( sal_True );
+ m_pCtlPixel->SetPaintable( true );
m_pBxPixelEditor->Enable();
m_pBtnModify->Enable();
m_pBtnAdd->Enable();
@@ -393,7 +393,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
else
{
m_pCtlPixel->Reset();
- m_pCtlPixel->SetPaintable( sal_False );
+ m_pCtlPixel->SetPaintable( false );
m_pBxPixelEditor->Disable();
m_pBtnModify->Disable();
m_pBtnAdd->Disable();
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index da89069cd00a..8e997ac4d203 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -92,10 +92,10 @@ namespace svx
*/
void initializeFrom(
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
- sal_Bool has(DataAccessDescriptorProperty _eWhich) const;
+ bool has(DataAccessDescriptorProperty _eWhich) const;
/** erases the given property from the descriptor
*/
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index b874ca8ac338..e66c3358bef7 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -113,11 +113,11 @@ namespace svx
@param _nFormats
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
*/
- static sal_Bool extractColumnDescriptor(
+ static bool extractColumnDescriptor(
const TransferableDataHelper& _rData
,OUString& _rDatasource
,OUString& _rDatabaseLocation
@@ -216,7 +216,7 @@ namespace svx
@param _nFormats
formats to accept
*/
- static sal_Bool canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors);
+ static bool canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors);
/** extracts a object descriptor from the transferable given
*/
@@ -245,7 +245,7 @@ namespace svx
,const sal_Int32 _nCommandType
,const OUString& _rCommand
,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
- ,sal_Bool _bAddCommand
+ ,bool _bAddCommand
,const OUString& _sActiveCommand);
};
@@ -267,7 +267,7 @@ namespace svx
@param _nFormats
formats to accept
*/
- static sal_Bool canExtractDescriptor(const DataFlavorExVector& _rFlavors);
+ static bool canExtractDescriptor(const DataFlavorExVector& _rFlavors);
/** extracts a object descriptor from the transferable given
*/
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 81374279069f..a28905bf5178 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -53,7 +53,7 @@ namespace svx
@param _rFlavors
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
*/
@@ -65,7 +65,7 @@ namespace svx
virtual void AddSupportedFormats();
virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- static sal_uInt32 getDescriptorFormatId(sal_Bool _bExtractForm);
+ static sal_uInt32 getDescriptorFormatId(bool _bExtractForm);
};
diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index 1818e10e8dc0..58ebe1dfa745 100644
--- a/include/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
@@ -42,7 +42,7 @@ namespace svxform
static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc;
- mutable sal_Bool m_bCreateAlready;
+ mutable bool m_bCreateAlready;
private:
mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
@@ -128,12 +128,12 @@ namespace svxform
/** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
@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
@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 >
getFieldsByCommandDescriptor(
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index bd21bcb0599d..0f2d96c88671 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -36,14 +36,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes
private:
// Compound object
Color aDefaultAmbientColor;
- sal_Bool bDefaultCreateNormals;
- sal_Bool bDefaultCreateTexture;
+ bool bDefaultCreateNormals;
+ bool bDefaultCreateTexture;
// Cube object
basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize;
- sal_uInt16 nDefaultCubeSideFlags;
- sal_Bool bDefaultCubePosIsCenter;
+ sal_uInt16 nDefaultCubeSideFlags;
+ bool bDefaultCubePosIsCenter;
// Sphere object
basegfx::B3DPoint aDefaultSphereCenter;
@@ -51,18 +51,18 @@ private:
// Lathe object
long nDefaultLatheEndAngle;
- sal_Bool bDefaultLatheSmoothed;
- sal_Bool bDefaultLatheSmoothFrontBack;
- sal_Bool bDefaultLatheCharacterMode;
- sal_Bool bDefaultLatheCloseFront;
- sal_Bool bDefaultLatheCloseBack;
+ bool bDefaultLatheSmoothed;
+ bool bDefaultLatheSmoothFrontBack;
+ bool bDefaultLatheCharacterMode;
+ bool bDefaultLatheCloseFront;
+ bool bDefaultLatheCloseBack;
// Extrude object
- sal_Bool bDefaultExtrudeSmoothed;
- sal_Bool bDefaultExtrudeSmoothFrontBack;
- sal_Bool bDefaultExtrudeCharacterMode;
- sal_Bool bDefaultExtrudeCloseFront;
- sal_Bool bDefaultExtrudeCloseBack;
+ bool bDefaultExtrudeSmoothed;
+ bool bDefaultExtrudeSmoothFrontBack;
+ bool bDefaultExtrudeCharacterMode;
+ bool bDefaultExtrudeCloseFront;
+ bool bDefaultExtrudeCloseBack;
public:
// Construktor
@@ -76,10 +76,10 @@ public:
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
- sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
- void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; }
- sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
- void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; }
+ bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
+ void SetDefaultCreateNormals(const bool bNew) { bDefaultCreateNormals = bNew; }
+ bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
+ void SetDefaultCreateTexture(const bool bNew) { bDefaultCreateTexture = bNew; }
// Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
@@ -88,8 +88,8 @@ public:
void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
- sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
- void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; }
+ bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
+ void SetDefaultCubePosIsCenter(const bool bNew) { bDefaultCubePosIsCenter = bNew; }
// Sphere object
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
@@ -100,28 +100,28 @@ public:
// Lathe object
long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
- sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
- void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; }
- sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
- void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
- sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
- void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; }
- sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
- void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; }
- sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
- void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; }
+ bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
+ void SetDefaultLatheSmoothed(const bool bNew) { bDefaultLatheSmoothed = bNew; }
+ bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
+ void SetDefaultLatheSmoothFrontBack(const bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
+ bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
+ void SetDefaultLatheCharacterMode(const bool bNew) { bDefaultLatheCharacterMode = bNew; }
+ bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
+ void SetDefaultLatheCloseFront(const bool bNew) { bDefaultLatheCloseFront = bNew; }
+ bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
+ void SetDefaultLatheCloseBack(const bool bNew) { bDefaultLatheCloseBack = bNew; }
// Extrude object
- sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
- void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; }
- sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
- void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
- sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
- void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
- sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
- void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; }
- sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
- void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; }
+ bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
+ void SetDefaultExtrudeSmoothed(const bool bNew) { bDefaultExtrudeSmoothed = bNew; }
+ bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
+ void SetDefaultExtrudeSmoothFrontBack(const bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
+ bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
+ void SetDefaultExtrudeCharacterMode(const bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
+ bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
+ void SetDefaultExtrudeCloseFront(const bool bNew) { bDefaultExtrudeCloseFront = bNew; }
+ bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
+ void SetDefaultExtrudeCloseBack(const bool bNew) { bDefaultExtrudeCloseBack = bNew; }
};
#endif // INCLUDED_SVX_DEFLT3D_HXX
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index a0b42672645d..455ddfc65ba5 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -68,7 +68,7 @@ class SvxPixelCtlAccessible;
class SVX_DLLPUBLIC SvxRectCtl : public Control
{
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 Bitmap& GetRectBitmap( void );
SVX_DLLPRIVATE void Resize_Impl();
@@ -87,7 +87,7 @@ protected:
Bitmap* pBitmap;
CTL_STATE m_nState;
- sal_Bool mbCompleteDisable;
+ bool mbCompleteDisable;
RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const;
Point GetPointFromRP( RECT_POINT ) const;
@@ -128,8 +128,8 @@ public:
RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const;
- sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; }
- void DoCompletelyDisable(sal_Bool bNew);
+ bool IsCompletelyDisabled() const { return mbCompleteDisable; }
+ void DoCompletelyDisable(bool bNew);
void SetCS(CTL_STYLE eNew);
};
@@ -172,8 +172,8 @@ protected:
Color aBackgroundColor;
Color aLineColor;
Size aRectSize;
- sal_uInt16* pPixel;
- sal_Bool bPaintable;
+ sal_uInt16* pPixel;
+ bool bPaintable;
//Add member identifying position
Point aFocusPosition;
Rectangle implCalFocusRect( const Point& aPosition );
@@ -202,7 +202,7 @@ public:
sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber );
sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
- void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
+ void SetPaintable( bool bTmp ) { bPaintable = bTmp; }
void Reset();
SvxPixelCtlAccessible* m_pAccess;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess;
@@ -401,7 +401,7 @@ private:
SdrPathObj* mpLineObjC;
Graphic* mpGraphic;
- sal_Bool mbWithSymbol;
+ bool mbWithSymbol;
Size maSymbolSize;
public:
@@ -410,7 +410,7 @@ public:
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 ResizeSymbol( const Size& s );
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 789f3f87825f..869eec2b1042 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -329,8 +329,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE );
// pShape2d Convert in scenes which include 3D Objects
E3dDefaultAttributes a3DDefaultAttr;
- a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True );
- a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True );
+ a3DDefaultAttr.SetDefaultLatheCharacterMode( true );
+ a3DDefaultAttr.SetDefaultExtrudeCharacterMode( true );
E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 27515989e779..2364a2a1c905 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -158,7 +158,7 @@ void SvxRectCtl::Resize_Impl()
break;
}
Reset();
- InitSettings( sal_True, sal_True );
+ InitSettings( true, true );
}
@@ -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();
@@ -372,9 +372,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
void SvxRectCtl::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
- InitSettings( sal_True, sal_False );
+ InitSettings( true, false );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
- InitSettings( sal_False, sal_True );
+ InitSettings( false, true );
Window::StateChanged( nType );
}
@@ -384,7 +384,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
- InitSettings( sal_True, sal_True );
+ InitSettings( true, true );
else
Window::DataChanged( rDCEvt );
}
@@ -745,7 +745,7 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point&
}
// CompletelyDisabled() added to have a disabled state for SvxRectCtl
-void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew)
+void SvxRectCtl::DoCompletelyDisable(bool bNew)
{
mbCompleteDisable = bNew;
Invalidate();
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 00b0b0644d5d..1b4847a10f02 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -34,14 +34,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
void E3dDefaultAttributes::Reset()
{
// Compound object
- bDefaultCreateNormals = sal_True;
- bDefaultCreateTexture = sal_True;
+ bDefaultCreateNormals = true;
+ bDefaultCreateTexture = true;
// Cube object
aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
nDefaultCubeSideFlags = CUBE_FULL;
- bDefaultCubePosIsCenter = sal_False;
+ bDefaultCubePosIsCenter = false;
// Sphere object
aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
@@ -49,18 +49,18 @@ void E3dDefaultAttributes::Reset()
// Lathe object
nDefaultLatheEndAngle = 3600;
- bDefaultLatheSmoothed = sal_True;
- bDefaultLatheSmoothFrontBack = sal_False;
- bDefaultLatheCharacterMode = sal_False;
- bDefaultLatheCloseFront = sal_True;
- bDefaultLatheCloseBack = sal_True;
+ bDefaultLatheSmoothed = true;
+ bDefaultLatheSmoothFrontBack = false;
+ bDefaultLatheCharacterMode = false;
+ bDefaultLatheCloseFront = true;
+ bDefaultLatheCloseBack = true;
// Extrude object
- bDefaultExtrudeSmoothed = sal_True;
- bDefaultExtrudeSmoothFrontBack = sal_False;
- bDefaultExtrudeCharacterMode = sal_False;
- bDefaultExtrudeCloseFront = sal_True;
- bDefaultExtrudeCloseBack = sal_True;
+ bDefaultExtrudeSmoothed = true;
+ bDefaultExtrudeSmoothFrontBack = false;
+ bDefaultExtrudeCharacterMode = false;
+ bDefaultExtrudeCloseFront = true;
+ bDefaultExtrudeCloseBack = true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 4428776ddd2d..a945093d21a8 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -708,9 +708,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
{
E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
if(bExtrude)
- aDefault.SetDefaultExtrudeCharacterMode(sal_True);
+ aDefault.SetDefaultExtrudeCharacterMode(true);
else
- aDefault.SetDefaultLatheCharacterMode(sal_True);
+ aDefault.SetDefaultLatheCharacterMode(true);
// Get Itemset of the original object
SfxItemSet aSet(pObj->GetMergedItemSet());
@@ -725,8 +725,8 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
{
// This SdrPathObj is not filled, leave the front and rear face out.
// Moreover, a two-sided representation necessary.
- aDefault.SetDefaultExtrudeCloseFront(sal_False);
- aDefault.SetDefaultExtrudeCloseBack(sal_False);
+ aDefault.SetDefaultExtrudeCloseFront(false);
+ aDefault.SetDefaultExtrudeCloseBack(false);
aSet.Put(Svx3DDoubleSidedItem(sal_True));
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 60c5284cab03..a32cb57e7b8f 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -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);
- sal_Bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE);
- sal_Bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR);
+ bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR);
+ bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE);
+ bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR);
for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
aCheck != _rFlavors.end();
++aCheck
)
{
if (bFieldFormat && (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == aCheck->mnSotId))
- return sal_True;
+ return true;
if (bControlFormat && (SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == aCheck->mnSotId))
- return sal_True;
+ return true;
if (bDescriptorFormat && (getDescriptorFormatId() == aCheck->mnSotId))
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -313,7 +313,7 @@ namespace svx
}
- sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData
+ bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData
,OUString& _rDatasource
,OUString& _rDatabaseLocation
,OUString& _rConnectionResource
@@ -334,7 +334,7 @@ namespace svx
aDescriptor[daCommand] >>= _rCommand;
aDescriptor[daCommandType] >>= _nCommandType;
aDescriptor[daColumnName] >>= _rFieldName;
- return sal_True;
+ return true;
}
// check if we have a (string) format we can use ....
@@ -344,7 +344,7 @@ namespace svx
if (_rData.HasFormat(SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE))
nRecognizedFormat = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE;
if (!nRecognizedFormat)
- return sal_False;
+ return false;
OUString sFieldDescription;
const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription);
@@ -355,7 +355,7 @@ namespace svx
_nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32();
_rFieldName = sFieldDescription.getToken(3, cSeparator);
- return sal_True;
+ return true;
}
@@ -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();
aCheck != _rFlavors.end();
@@ -494,13 +494,13 @@ namespace svx
)
{
if (SOT_FORMATSTR_ID_DBACCESS_TABLE == aCheck->mnSotId)
- return sal_True;
+ return true;
if (SOT_FORMATSTR_ID_DBACCESS_QUERY == aCheck->mnSotId)
- return sal_True;
+ return true;
if (SOT_FORMATSTR_ID_DBACCESS_COMMAND == aCheck->mnSotId)
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -571,7 +571,7 @@ namespace svx
,const sal_Int32 _nCommandType
,const OUString& _rCommand
,const Reference< XConnection >& _rxConnection
- ,sal_Bool _bAddCommand
+ ,bool _bAddCommand
,const OUString& _sActiveCommand)
{
m_aDescriptor.setDataSource(_rDatasource);
@@ -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();
for ( ;
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 0687e6aa8bbf..5af2af2e6b21 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -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_nFormFormat = (sal_uInt32)-1;
@@ -93,14 +93,14 @@ namespace svx
sal_Bool OComponentTransferable::GetData( const DataFlavor& _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 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();
for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
@@ -109,17 +109,17 @@ namespace svx
)
{
if ( getDescriptorFormatId(_bForm) == aCheck->mnSotId )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData)
{
- sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(sal_True));
- if ( bForm || _rData.HasFormat(getDescriptorFormatId(sal_False)) )
+ sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(true));
+ if ( bForm || _rData.HasFormat(getDescriptorFormatId(false)) )
{
// the object has a real descriptor object (not just the old compatible format)
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 3c1371234306..dc75cb6c7875 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -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();
}
@@ -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)
clear();
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 6f288a758d0d..a22155887418 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -57,7 +57,7 @@ namespace svxform
ODbtoolsClient::ODbtoolsClient()
{
- m_bCreateAlready = sal_False;
+ m_bCreateAlready = false;
}
@@ -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() )
bRet = m_xDataAccessTools->canInsert( _rxCursorSet );
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() )
bRet = m_xDataAccessTools->canUpdate( _rxCursorSet );
return bRet;
generated by cgit (git 2.34.1) at 2024-07-12 18:52:30 +0000