summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-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
6 files changed, 61 insertions, 61 deletions
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 );