summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
commit006b8504d7c633a61b4953151e71b83fda8e204d (patch)
tree80bcda35b0c8e37304e4a08d952a4bba130a4c9b /svx
parent2ccbdca418fccd80bcab976a8033a1c62dc60da2 (diff)
removetooltypes01: #i112600# remove tooltypes from svx
Diffstat (limited to 'svx')
-rwxr-xr-xsvx/inc/svx/AccessibleShape.hxx6
-rw-r--r--svx/inc/svx/IAccessibleParent.hxx4
-rw-r--r--svx/inc/svx/camera3d.hxx2
-rw-r--r--svx/inc/svx/dataaccessdescriptor.hxx4
-rw-r--r--svx/inc/svx/fmgridcl.hxx2
-rw-r--r--svx/inc/svx/fmpage.hxx4
-rw-r--r--svx/inc/svx/fontlb.hxx2
-rw-r--r--svx/inc/svx/gallery1.hxx2
-rw-r--r--svx/inc/svx/globl3d.hxx26
-rw-r--r--svx/inc/svx/grfflt.hxx2
-rw-r--r--svx/inc/svx/obj3d.hxx6
-rw-r--r--svx/inc/svx/polysc3d.hxx2
-rw-r--r--svx/inc/svx/sdasaitm.hxx4
-rw-r--r--svx/inc/svx/sdtacitm.hxx2
-rw-r--r--svx/inc/svx/svdmark.hxx32
-rw-r--r--svx/inc/svx/svdmodel.hxx2
-rw-r--r--svx/inc/svx/svdomedia.hxx2
-rw-r--r--svx/inc/svx/svdopage.hxx2
-rw-r--r--svx/inc/svx/svdovirt.hxx6
-rw-r--r--svx/inc/svx/svdtrans.hxx30
-rw-r--r--svx/inc/svx/svdtypes.hxx12
-rw-r--r--svx/inc/svx/sxelditm.hxx14
-rw-r--r--svx/inc/svx/sxenditm.hxx16
-rw-r--r--svx/inc/svx/sxmtaitm.hxx2
-rw-r--r--svx/inc/svx/sxmtfitm.hxx2
-rw-r--r--svx/inc/svx/xexch.hxx2
-rwxr-xr-xsvx/source/accessibility/AccessibleShape.cxx2
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx10
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx6
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/dialcontrol.cxx10
-rw-r--r--svx/source/dialog/dlgctl3d.cxx18
-rw-r--r--svx/source/dialog/dlgutil.cxx2
-rw-r--r--svx/source/dialog/fontlb.cxx6
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx6
-rw-r--r--svx/source/engine3d/camera3d.cxx2
-rw-r--r--svx/source/engine3d/deflt3d.cxx26
-rw-r--r--svx/source/engine3d/extrud3d.cxx6
-rw-r--r--svx/source/engine3d/polysc3d.cxx2
-rw-r--r--svx/source/engine3d/scene3d.cxx22
-rw-r--r--svx/source/engine3d/viewpt3d2.cxx16
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/trace.cxx18
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx4
-rw-r--r--svx/source/form/dbtoolsclient.cxx2
-rw-r--r--svx/source/form/filtnav.cxx4
-rw-r--r--svx/source/form/fmexpl.cxx2
-rw-r--r--svx/source/form/fmpage.cxx4
-rw-r--r--svx/source/form/fmscriptingenv.cxx2
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/navigatortreemodel.cxx4
-rw-r--r--svx/source/form/tabwin.cxx6
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/inc/delayedevent.hxx2
-rw-r--r--svx/source/inc/filtnav.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx6
-rw-r--r--svx/source/inc/fmobj.hxx2
-rw-r--r--svx/source/inc/fmpgeimp.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx16
-rw-r--r--svx/source/inc/formcontroller.hxx10
-rw-r--r--svx/source/inc/gridcell.hxx16
-rw-r--r--svx/source/items/drawitem.cxx48
-rw-r--r--svx/source/items/hlnkitem.cxx12
-rw-r--r--svx/source/items/zoomitem.cxx8
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx12
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx6
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx12
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx2
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx2
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx4
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
-rw-r--r--svx/source/stbctrls/pszctrl.cxx2
-rw-r--r--svx/source/svdraw/clonelist.cxx4
-rw-r--r--svx/source/svdraw/svddrag.cxx24
-rw-r--r--svx/source/svdraw/svddrgmt.cxx22
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdfmtf.hxx22
-rw-r--r--svx/source/svdraw/svdibrow.cxx2
-rw-r--r--svx/source/svdraw/svdmark.cxx70
-rw-r--r--svx/source/svdraw/svdomedia.cxx6
-rw-r--r--svx/source/svdraw/svdopage.cxx32
-rw-r--r--svx/source/svdraw/svdotxdr.cxx8
-rw-r--r--svx/source/svdraw/svdview.cxx4
-rw-r--r--svx/source/svdraw/svdviter.cxx2
-rw-r--r--svx/source/table/tablecontroller.hxx2
-rw-r--r--svx/source/table/tablertfexporter.cxx8
-rw-r--r--svx/source/table/tableundo.cxx10
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx8
-rw-r--r--svx/source/unodraw/unoctabl.cxx10
-rw-r--r--svx/source/unodraw/unomod.cxx10
-rw-r--r--svx/source/unodraw/unopage.cxx4
-rw-r--r--svx/source/unodraw/unoshap3.cxx2
-rw-r--r--svx/source/unodraw/unottabl.cxx2
-rw-r--r--svx/source/xml/xmlxtexp.cxx6
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx2
-rw-r--r--svx/source/xoutdev/xpool.cxx6
101 files changed, 416 insertions, 416 deletions
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index e1979294b2d8..d9eee6cb42fd 100755
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -132,7 +132,7 @@ public:
@return
The returned flag indicates whether the specified state has been
- changed (<TRUE/>), i.e. it has formerly not been set.
+ changed (<sal_True/>), i.e. it has formerly not been set.
*/
virtual sal_Bool SetState (sal_Int16 aState);
@@ -146,7 +146,7 @@ public:
@return
The returned flag indicates whether the specified state has been
- changed (<TRUE/>), i.e. it has formerly been set.
+ changed (<sal_True/>), i.e. it has formerly been set.
*/
virtual sal_Bool ResetState (sal_Int16 aState);
@@ -156,7 +156,7 @@ public:
@param aState
The state for which to return its value.
@return
- A value of <TRUE/> indicates that the state is set. A <FALSE/>
+ A value of <sal_True/> indicates that the state is set. A <sal_False/>
value indicates an unset state or the inability to access the
entity that manages the state set.
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx
index be97a49e982b..d02182972248 100644
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/svx/inc/svx/IAccessibleParent.hxx
@@ -74,9 +74,9 @@ public:
The TreeInfo for the old child.
@return
- If the replacement has taken place successfully <TRUE/> is
+ If the replacement has taken place successfully <sal_True/> is
returned. If the replacement can not be carried out or an error
- occurs that does not result in an exception then <FALSE/> is
+ occurs that does not result in an exception then <sal_False/> is
returned.
@raises RuntimeException
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 89c76c797622..73cd1824933f 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -86,7 +86,7 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
// Um den Blickpunkt drehen, Position wird dabei veraendert
void RotateAroundLookAt(double fHAngle, double fVAngle);
- void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE)
+ void SetAutoAdjustProjection(FASTBOOL bAdjust = sal_True)
{ bAutoAdjustProjection = bAdjust; }
FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
};
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx
index f765b1fce2b9..e7006a923b1a 100644
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/svx/inc/svx/dataaccessdescriptor.hxx
@@ -108,7 +108,7 @@ namespace svx
createAnySequence();
/** initialized the descriptor from the property set given
- <p>If <arg>_bClear</arg> is <TRUE/>, the descriptor will clear all it's current settings before
+ <p>If <arg>_bClear</arg> is <sal_True/>, the descriptor will clear all it's current settings before
initializing with the new ones.</p>
*/
void initializeFrom(
@@ -116,7 +116,7 @@ namespace svx
sal_Bool _bClear = sal_True);
/** initialized the descriptor from the property values given
- <p>If <arg>_bClear</arg> is <TRUE/>, the descriptor will clear all it's current settings before
+ <p>If <arg>_bClear</arg> is <sal_True/>, the descriptor will clear all it's current settings before
initializing with the new ones.</p>
*/
void initializeFrom(
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index c0e9e7e34d78..ef76df8a2d15 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -207,7 +207,7 @@ protected:
@param _pColumn
The column to compare with.
@return
- <TRUE/> if the column is selected, otherwise <FALSE/>
+ <sal_True/> if the column is selected, otherwise <sal_False/>
*/
sal_Bool isColumnSelected(sal_uInt16 nColumnId,DbGridColumn* _pColumn);
};
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 4195f776f3c2..d50187f7b81b 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -61,10 +61,10 @@ public:
virtual SdrPage* Clone() const;
using SdrPage::Clone;
- virtual void InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND,
+ virtual void InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND,
const SdrInsertReason* pReason=NULL);
- virtual SdrObject* RemoveObject(ULONG nObjNum);
+ virtual SdrObject* RemoveObject(sal_uLong nObjNum);
// Zugriff auf alle Formulare
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 813b01ba390f..8051eded95b6 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -96,7 +96,7 @@ public:
void SetNoSelection();
/** Returns the position of the entry currently selected or LIST_APPEND. */
- ULONG GetSelectEntryPos() const;
+ sal_uLong GetSelectEntryPos() const;
/** Returns the text of the selected entry or an empty string. */
XubString GetSelectEntry() const;
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index b4171c242cb6..40888a095536 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -80,7 +80,7 @@ public:
sal_Bool IsReadOnly() const { return bReadOnly; }
sal_Bool IsDefault() const;
- BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
+ sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
sal_Bool IsModified() const { return bModified; }
void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 1560f96dc1f5..7445259d9989 100644
--- a/svx/inc/svx/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
@@ -35,19 +35,19 @@
const double PrecisionLimit = 1.0e-14;
-const UINT32 E3dInventor = UINT32('E')*0x00000001+
- UINT32('3')*0x00000100+
- UINT32('D')*0x00010000+
- UINT32('1')*0x01000000;
+const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
+ sal_uInt32('3')*0x00000100+
+ sal_uInt32('D')*0x00010000+
+ sal_uInt32('1')*0x01000000;
-const UINT16 E3D_SCENE_ID = 1;
-const UINT16 E3D_POLYSCENE_ID = 2;
-const UINT16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
-const UINT16 E3D_CUBEOBJ_ID = 4;
-const UINT16 E3D_SPHEREOBJ_ID = 5;
-const UINT16 E3D_EXTRUDEOBJ_ID = 6;
-const UINT16 E3D_LATHEOBJ_ID = 7;
-const UINT16 E3D_COMPOUNDOBJ_ID = 8;
-const UINT16 E3D_POLYGONOBJ_ID = 9;
+const sal_uInt16 E3D_SCENE_ID = 1;
+const sal_uInt16 E3D_POLYSCENE_ID = 2;
+const sal_uInt16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
+const sal_uInt16 E3D_CUBEOBJ_ID = 4;
+const sal_uInt16 E3D_SPHEREOBJ_ID = 5;
+const sal_uInt16 E3D_EXTRUDEOBJ_ID = 6;
+const sal_uInt16 E3D_LATHEOBJ_ID = 7;
+const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8;
+const sal_uInt16 E3D_POLYGONOBJ_ID = 9;
#endif // _E3D_GLOBL3D_HXX
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 88c31fe42d13..584245a78cf2 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter
{
public:
- static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+ static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
static void DisableGraphicFilterSlots( SfxItemSet& rSet );
};
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index c21f6d2ddcf2..5c25582a1c7b 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -259,7 +259,7 @@ public :
sal_Bool GetDoubleSided() const
{ return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
- // NormalsKind: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
+ // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetNormalsKind() const
{ return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); }
@@ -267,11 +267,11 @@ public :
sal_Bool GetNormalsInvert() const
{ return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
- // TextureProjX: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
+ // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetTextureProjectionX() const
{ return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); }
- // TextureProjY: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
+ // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetTextureProjectionY() const
{ return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); }
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index d33a12b671c1..2375a85ecb9b 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -44,7 +44,7 @@ public:
E3dPolyScene();
E3dPolyScene(E3dDefaultAttributes& rDefault);
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
};
#endif // _E3D_POLYSC3D_HXX
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 882c25a1fdaf..889207e22d5e 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -64,8 +64,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
#ifdef SDR_ISPOOLABLE
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index 6459924bab5b..05f58b6abd20 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -33,7 +33,7 @@
// Anzahl der Durchlaeufe. 0=Endlos.
class SdrTextAniCountItem: public SfxUInt16Item {
public:
- SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
+ SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {}
};
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index d67704b19c7d..2a05e81e0007 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrUShortCont
sal_Bool mbSorted;
private:
- void CheckSort(ULONG nPos);
+ void CheckSort(sal_uLong nPos);
public:
SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize)
@@ -98,9 +98,9 @@ public:
}
}
- void Insert(sal_uInt16 nElem, ULONG nPos = CONTAINER_APPEND)
+ void Insert(sal_uInt16 nElem, sal_uLong nPos = CONTAINER_APPEND)
{
- maArray.Insert((void*)ULONG(nElem),nPos);
+ maArray.Insert((void*)sal_uLong(nElem),nPos);
if(mbSorted)
{
@@ -108,14 +108,14 @@ public:
}
}
- void Remove(ULONG nPos)
+ void Remove(sal_uLong nPos)
{
maArray.Remove(nPos);
}
- void Replace(sal_uInt16 nElem, ULONG nPos)
+ void Replace(sal_uInt16 nElem, sal_uLong nPos)
{
- maArray.Replace((void*)ULONG(nElem), nPos);
+ maArray.Replace((void*)sal_uLong(nElem), nPos);
if(mbSorted)
{
@@ -123,24 +123,24 @@ public:
}
}
- sal_uInt16 GetObject(ULONG nPos) const
+ sal_uInt16 GetObject(sal_uLong nPos) const
{
return sal_uInt16(sal_uIntPtr(maArray.GetObject(nPos)));
}
- ULONG GetPos(sal_uInt16 nElem) const
+ sal_uLong GetPos(sal_uInt16 nElem) const
{
- return maArray.GetPos((void*)(ULONG)nElem);
+ return maArray.GetPos((void*)(sal_uLong)nElem);
}
- ULONG GetCount() const
+ sal_uLong GetCount() const
{
return maArray.Count();
}
sal_Bool Exist(sal_uInt16 nElem) const
{
- return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(ULONG)nElem));
+ return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(sal_uLong)nElem));
}
};
@@ -321,20 +321,20 @@ public:
mbSorted = sal_False;
}
- ULONG GetMarkCount() const
+ sal_uLong GetMarkCount() const
{
return maList.Count();
}
- SdrMark* GetMark(ULONG nNum) const
+ SdrMark* GetMark(sal_uLong nNum) const
{
return (SdrMark*)(maList.GetObject(nNum));
}
- ULONG FindObject(const SdrObject* pObj) const;
+ sal_uLong FindObject(const SdrObject* pObj) const;
void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
- void DeleteMark(ULONG nNum);
- void ReplaceMark(const SdrMark& rNewMark, ULONG nNum);
+ void DeleteMark(sal_uLong nNum);
+ void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum);
void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False);
sal_Bool DeletePageView(const SdrPageView& rPV);
sal_Bool InsertPageView(const SdrPageView& rPV);
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 01661e1ca5b0..86b791b075c2 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -579,7 +579,7 @@ public:
FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False,
FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False);
- // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,FALSE,bUndo,!bMoveNoCopy);
+ // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy);
void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
sal_uInt16 nDestPos,
FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False);
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index 5b0980d8bb30..46991a66c526 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -56,7 +56,7 @@ public:
virtual FASTBOOL HasTextEdit() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx
index eea49236531e..7307bc7275bb 100644
--- a/svx/inc/svx/svdopage.hxx
+++ b/svx/inc/svx/svdopage.hxx
@@ -62,7 +62,7 @@ public:
// #i96598#
virtual void SetBoundRectDirty();
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
virtual void operator=(const SdrObject& rObj);
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index 2c1f1ae0878c..dba62f84730e 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -70,8 +70,8 @@ public:
virtual void SetModel(SdrModel* pNewModel);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT32 GetObjInventor() const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt32 GetObjInventor() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual SdrObjList* GetSubList() const;
virtual const Rectangle& GetCurrentBoundRect() const;
@@ -131,7 +131,7 @@ public:
virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual long GetRotateAngle() const;
- virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+ virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const;
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index 36116e821369..d1cc076fe824 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -68,7 +68,7 @@ inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),
void MoveXPoly(XPolygon& rPoly, const Size& S);
void MoveXPoly(XPolyPolygon& rPoly, const Size& S);
-SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=FALSE);
+SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=sal_False);
inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact);
void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -90,11 +90,11 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
-inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE);
+inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
+void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False);
// rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt!
// anschliessend muss rPnt nur noch um rCenter gedreht werden.
@@ -180,7 +180,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
SVX_DLLPUBLIC long GetAngle(const Point& rPnt);
long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99
SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf 0.00..359.99
-USHORT GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
+sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
// Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2
// Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert.
long GetLen(const Point& rPnt);
@@ -305,14 +305,14 @@ private:
SVX_DLLPRIVATE void Undirty();
SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); }
public:
- SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
- SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; }
- SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
- SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; }
- void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=FALSE; bDirty=TRUE; }
- void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=TRUE; bDirty=TRUE; }
- void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
- void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; }
+ SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+ SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
+ SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+ SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
+ void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; }
+ void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=sal_True; bDirty=sal_True; }
+ void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+ void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; }
void TakeStr(long nVal, XubString& rStr) const;
static void TakeUnitStr(MapUnit eUnit, XubString& rStr);
static void TakeUnitStr(FieldUnit eUnit, XubString& rStr);
diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx
index 9c895e3f5302..67161e8eb748 100644
--- a/svx/inc/svx/svdtypes.hxx
+++ b/svx/inc/svx/svdtypes.hxx
@@ -40,10 +40,10 @@
// @@@@ @@@@@ @@ @@ @@@@ @@@@@ @@@@ @@@@@ @@@@ @@
////////////////////////////////////////////////////////////////////////////////////////////////////
-const UINT32 SdrInventor=UINT32('S')*0x00000001+
- UINT32('V')*0x00000100+
- UINT32('D')*0x00010000+
- UINT32('r')*0x01000000;
+const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+
+ sal_uInt32('V')*0x00000100+
+ sal_uInt32('D')*0x00010000+
+ sal_uInt32('r')*0x01000000;
// Kommandos fuer EndCreate()
enum SdrCreateCmd {SDRCREATE_NEXTPOINT, // Naechster Polygonpunkt, Kreissegment: Naechste Koordinate
@@ -90,10 +90,10 @@ enum SdrConvertType {SDRCONVERT_POLY, // reines Polygon erzeugen
// dann diesen Wert:
#define SDRLAYER_NOTFOUND 0xFF
// Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet
-// zuwerfen, bekommt dann jedoch immer FALSE, bzw. tut die Methode nix.
+// zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix.
////////////////////////////////////////////////////////////////////////////////////////////////////
// Typdeklaration fuer Layer-IDs
-typedef BYTE SdrLayerID;
+typedef sal_uInt8 SdrLayerID;
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
index aa60cf8d030c..5057f9d05f85 100644
--- a/svx/inc/svx/sxelditm.hxx
+++ b/svx/inc/svx/sxelditm.hxx
@@ -33,7 +33,7 @@
class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item {
public:
- SdrEdgeLineDeltaAnzItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
+ SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn) {}
};
@@ -41,24 +41,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem {
public:
SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {}
SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem {
public:
SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {}
SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem {
public:
SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {}
SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif
diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
index 442dc52bbaa1..fab72e1bea9d 100644
--- a/svx/inc/svx/sxenditm.hxx
+++ b/svx/inc/svx/sxenditm.hxx
@@ -35,32 +35,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem {
public:
SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {}
SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem {
public:
SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {}
SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem {
public:
SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {}
SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem {
public:
SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {}
SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SdrEdgeNode1GlueDistItem: public SdrMetricItem {
diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx
index e9b35bc425bc..0d7f3d1fb777 100644
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/svx/inc/svx/sxmtaitm.hxx
@@ -33,7 +33,7 @@
// Den Text automatisch zurechtdrehen (Automatisches UpsideDown).
// TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht
-// den Text bei TRUE nochmal.
+// den Text bei sal_True nochmal.
class SdrMeasureTextAutoAngleItem: public SdrYesNoItem {
public:
SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {}
diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx
index c971f69f652f..f43943bcc8d0 100644
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/svx/inc/svx/sxmtfitm.hxx
@@ -51,7 +51,7 @@ public:
// The decimal places used for the measure value
class SdrMeasureDecimalPlacesItem: public SfxInt16Item {
public:
- SdrMeasureDecimalPlacesItem(INT16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {}
+ SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {}
SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {}
};
diff --git a/svx/inc/svx/xexch.hxx b/svx/inc/svx/xexch.hxx
index ff317f0a7541..a3b1f10c6d1c 100644
--- a/svx/inc/svx/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
@@ -60,7 +60,7 @@ public:
SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
- static ULONG RegisterClipboardFormatName();
+ static sal_uLong RegisterClipboardFormatName();
XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem; }
};
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 4c1869f6997a..0d255ed5933f 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -254,7 +254,7 @@ void AccessibleShape::UpdateStates (void)
// XXX fix_me this has to be done with an extra interface later on
if ( m_pShape && maShapeTreeInfo.GetSdrView() )
{
- bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
+ bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True;
}
if (bShapeIsSelected)
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0119e7c71cbf..5ffd4e9cd45a 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -558,7 +558,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
throw (::com::sun::star::uno::RuntimeException)
{
svtools::ColorConfig aColorConfig;
- UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+ sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
return static_cast<sal_Int32>(nColor);
}
@@ -568,7 +568,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void)
throw (::com::sun::star::uno::RuntimeException)
{
- UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+ sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
return static_cast<sal_Int32>(nColor);
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 3545805f4966..0781ade6c97a 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -348,8 +348,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// pShape2d Umwandeln in Szene mit 3D Objekt
E3dDefaultAttributes a3DDefaultAttr;
- a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
- a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
+ a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True );
+ a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True );
E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
@@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
{
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
aSet.Put( XFillStyleItem ( XFILL_NONE ) );
- aSet.Put( Svx3DDoubleSidedItem( TRUE ) );
+ aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
}
else
{
@@ -410,7 +410,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
}
else
{
- SdrObject* pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+ SdrObject* pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
if ( pPath )
aPolyPoly = pPath->GetPathPoly();
@@ -516,7 +516,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
double fW = rVolume.getWidth();
double fH = rVolume.getHeight();
- rCamera.SetAutoAdjustProjection( FALSE );
+ rCamera.SetAutoAdjustProjection( sal_False );
rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 );
basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index ae7a1398c9e7..c20360db7c4b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -316,7 +316,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
nShearWink = -nShearWink;
nTan = -nTan;
}
- pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, FALSE);
+ pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
}
if( nRotateAngle )
{
@@ -399,7 +399,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
nShearWink = -nShearWink;
nTan = -nTan;
}
- pObj->Shear( aRect.Center(), nShearWink, nTan, FALSE);
+ pObj->Shear( aRect.Center(), nShearWink, nTan, sal_False);
}
sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
if( nRotateAngle )
@@ -435,7 +435,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
}
else
{
- pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+ pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
if ( pPath )
aPP = pPath->GetPathPoly();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 08a8e3b22edb..c3f1f0b17a52 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1302,7 +1302,7 @@ void SvxTPFilter::DeactivatePage()
pRedlinTable->SetFilterComment(IsComment());
utl::SearchParam aSearchParam( aEdComment.GetText(),
- utl::SearchParam::SRCH_REGEXP,sal_False,FALSE,sal_False );
+ utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
pRedlinTable->SetCommentParams(&aSearchParam);
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 562b194ab56a..2e5501e589af 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -78,7 +78,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) :
mrParent( rParent ),
mbEnabled( true )
{
- EnableRTL( FALSE );
+ EnableRTL( sal_False );
}
void DialControlBmp::InitBitmap( const Size& rSize, const Font& rFont )
@@ -183,7 +183,7 @@ void DialControlBmp::DrawBackground()
SetFillColor();
Erase();
- EnableRTL( TRUE ); // #107807# draw 3D effect in correct direction
+ EnableRTL( sal_True ); // #107807# draw 3D effect in correct direction
sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10;
Color aColor;
@@ -210,7 +210,7 @@ void DialControlBmp::DrawBackground()
SetFillColor( aColor );
DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() );
- EnableRTL( FALSE );
+ EnableRTL( sal_False );
// *** calibration ***
@@ -277,7 +277,7 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
mnCenterX = maWinSize.Width() / 2;
mnCenterY = maWinSize.Height() / 2;
- maWinFont.SetTransparent( TRUE );
+ maWinFont.SetTransparent( sal_True );
maBmpEnabled.DrawBackground( maWinSize, true );
maBmpDisabled.DrawBackground( maWinSize, false );
@@ -451,7 +451,7 @@ const Link& DialControl::GetModifyHdl() const
void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
{
mpImpl->Init( rWinSize, rWinFont );
- EnableRTL( FALSE ); // #107807# don't mirror mouse handling
+ EnableRTL( sal_False ); // #107807# don't mirror mouse handling
SetOutputSizePixel( mpImpl->maWinSize );
SetBackground();
}
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 95c27a5dcec8..5f05d360007c 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -90,7 +90,7 @@ void Svx3DPreviewControl::Construct()
{
// Do never mirror the preview window. This explicitly includes right
// to left writing environments.
- EnableRTL (FALSE);
+ EnableRTL (sal_False);
SetMapMode( MAP_100TH_MM );
// Model
@@ -119,7 +119,7 @@ void Svx3DPreviewControl::Construct()
double fH = rVolume.getHeight();
double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
- rCamera.SetAutoAdjustProjection(FALSE);
+ rCamera.SetAutoAdjustProjection(sal_False);
rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -387,7 +387,7 @@ void Svx3DLightControl::Construct2()
double fH = rVolume.getHeight();
double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
- rCamera.SetAutoAdjustProjection(FALSE);
+ rCamera.SetAutoAdjustProjection(sal_False);
rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -1095,8 +1095,8 @@ void SvxLightCtl3D::CheckSelection()
{
double fHor, fVer;
maLightControl.GetPosition(fHor, fVer);
- maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
- maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+ maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+ maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
}
}
@@ -1115,8 +1115,8 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer )
return;
maLightControl.SetPosition(fHor, fVer);
- maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
- maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+ maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+ maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
if(maUserInteractiveChangeCallback.IsSet())
{
@@ -1296,8 +1296,8 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG)
double fHor, fVer;
maLightControl.GetPosition(fHor, fVer);
- maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
- maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+ maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+ maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
if(maUserInteractiveChangeCallback.IsSet())
{
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index dede78faef1d..44a9762a023a 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -42,7 +42,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
{
FieldUnit eUnit = FUNIT_INCH;
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) )
eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue();
else
{
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index a6b03a17d890..984d7dca4af4 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -100,7 +100,7 @@ SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) :
maStdFont( GetFont() ),
mbUseFont( false )
{
- maStdFont.SetTransparent( TRUE );
+ maStdFont.SetTransparent( sal_True );
maEntryFont = maStdFont;
}
@@ -125,10 +125,10 @@ void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
void SvxFontListBox::SetNoSelection()
{
- SelectAll( FALSE, TRUE );
+ SelectAll( sal_False, sal_True );
}
-ULONG SvxFontListBox::GetSelectEntryPos() const
+sal_uLong SvxFontListBox::GetSelectEntryPos() const
{
SvLBoxEntry* pSvLBoxEntry = FirstSelected();
return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 92e2b9a68acc..5f91c6dabacb 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -107,7 +107,7 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
// rBindings.ExecuteSynchron( nId, (const SfxPoolItem**)&pSearchItem, 0L )
#define GetCheckBoxValue( rBox ) \
- rBox.IsEnabled() ? rBox.IsChecked() : FALSE
+ rBox.IsEnabled() ? rBox.IsChecked() : sal_False
#if ENABLE_LAYOUT
#undef SVX_RES
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 71868d8cc031..4fbd1f3c288e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2605,7 +2605,7 @@ void SvxRuler::ApplyBorders()
Debug_Impl(pEditWin,*pColumnItem);
#endif // DEBUGLIN
SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
- nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: sal_False);
+ nDragType & DRAG_OBJECT_ACTLINE_ONLY? sal_True : sal_False);
sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
(bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L );
@@ -2881,7 +2881,7 @@ sal_Bool SvxRuler::CalcLimits
(
long &nMax1, // zu setzenden Minimalwert
long &nMax2, // zu setzenden Maximalwert
- BOOL
+ sal_Bool
) const
/*
[Beschreibung]
@@ -3283,7 +3283,7 @@ void SvxRuler::CalcMinMax()
{
if(pObjectItem->HasLimits())
{
- if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: sal_True))
+ if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True))
{
nMaxLeft = ConvertPosPixel(nMaxLeft);
nMaxRight = ConvertPosPixel(nMaxRight);
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 813f25c1f75b..d64f7aeaa3a0 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -43,7 +43,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook
fResetFocalLength(fFocalLen),
fResetBankAngle(fBankAng),
fBankAngle(fBankAng),
- bAutoAdjustProjection(TRUE)
+ bAutoAdjustProjection(sal_True)
{
SetVPD(0);
SetPosition(rPos);
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 9e703abd7d0b..e8473033ccf3 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -49,14 +49,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
void E3dDefaultAttributes::Reset()
{
// Compound-Objekt
- bDefaultCreateNormals = TRUE;
- bDefaultCreateTexture = TRUE;
+ bDefaultCreateNormals = sal_True;
+ bDefaultCreateTexture = sal_True;
// Cube-Objekt
aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
nDefaultCubeSideFlags = CUBE_FULL;
- bDefaultCubePosIsCenter = FALSE;
+ bDefaultCubePosIsCenter = sal_False;
// Sphere-Objekt
aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
@@ -64,18 +64,18 @@ void E3dDefaultAttributes::Reset()
// Lathe-Objekt
nDefaultLatheEndAngle = 3600;
- bDefaultLatheSmoothed = TRUE;
- bDefaultLatheSmoothFrontBack = FALSE;
- bDefaultLatheCharacterMode = FALSE;
- bDefaultLatheCloseFront = TRUE;
- bDefaultLatheCloseBack = TRUE;
+ bDefaultLatheSmoothed = sal_True;
+ bDefaultLatheSmoothFrontBack = sal_False;
+ bDefaultLatheCharacterMode = sal_False;
+ bDefaultLatheCloseFront = sal_True;
+ bDefaultLatheCloseBack = sal_True;
// Extrude-Objekt
- bDefaultExtrudeSmoothed = TRUE;
- bDefaultExtrudeSmoothFrontBack = FALSE;
- bDefaultExtrudeCharacterMode = FALSE;
- bDefaultExtrudeCloseFront = TRUE;
- bDefaultExtrudeCloseBack = TRUE;
+ bDefaultExtrudeSmoothed = sal_True;
+ bDefaultExtrudeSmoothFrontBack = sal_False;
+ bDefaultExtrudeCharacterMode = sal_False;
+ bDefaultExtrudeCloseFront = sal_True;
+ bDefaultExtrudeCloseBack = sal_True;
}
// eof
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 423a846d86a1..b3fdd6fd9b00 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -116,7 +116,7 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
|*
\************************************************************************/
-UINT16 E3dExtrudeObj::GetObjIdentifier() const
+sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const
{
return E3D_EXTRUDEOBJ_ID;
}
@@ -190,9 +190,9 @@ void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const
|*
\************************************************************************/
-BOOL E3dExtrudeObj::IsBreakObjPossible()
+sal_Bool E3dExtrudeObj::IsBreakObjPossible()
{
- return TRUE;
+ return sal_True;
}
SdrAttrObj* E3dExtrudeObj::GetBreakObj()
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 212f5ccae44a..2ee7f795afc2 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -66,7 +66,7 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault)
|*
\************************************************************************/
-UINT16 E3dPolyScene::GetObjIdentifier() const
+sal_uInt16 E3dPolyScene::GetObjIdentifier() const
{
return E3D_POLYSCENE_ID;
}
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index f209ee93487a..7fc40f1abc60 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -329,7 +329,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const
|*
\************************************************************************/
-UINT16 E3dScene::GetObjIdentifier() const
+sal_uInt16 E3dScene::GetObjIdentifier() const
{
return E3D_SCENE_ID;
}
@@ -751,7 +751,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
// Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
// werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
// dafuer gibt es den
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
// So dass war die Szene, ab jetzt kommen die Objekte in der Szene
// 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen
@@ -770,7 +770,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects
NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
// zum Urpsung des Blattes
- SetGlueReallyAbsolute(FALSE); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+ SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
SetRectsDirty();
}
@@ -805,7 +805,7 @@ void E3dScene::RecalcSnapRect()
|*
\************************************************************************/
-BOOL E3dScene::IsBreakObjPossible()
+sal_Bool E3dScene::IsBreakObjPossible()
{
// Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind
SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS);
@@ -815,10 +815,10 @@ BOOL E3dScene::IsBreakObjPossible()
E3dObject* pObj = (E3dObject*) a3DIterator.Next();
DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!");
if(!pObj->IsBreakObjPossible())
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
@@ -831,7 +831,7 @@ basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
{
- UINT16 nSceneShadowSlant = (UINT16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
+ sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
}
@@ -847,7 +847,7 @@ FASTBOOL E3dScene::BegCreate(SdrDragStat& rStat)
aRect1.Justify();
rStat.SetActionRect(aRect1);
NbcSetSnapRect(aRect1);
- return TRUE;
+ return sal_True;
}
FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
@@ -858,8 +858,8 @@ FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
NbcSetSnapRect(aRect1);
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- return TRUE;
+ bSnapRectDirty=sal_True;
+ return sal_True;
}
FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -874,7 +874,7 @@ FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
FASTBOOL E3dScene::BckCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
void E3dScene::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index ce5ffd7ba90e..bbfe84fafbf2 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -185,7 +185,7 @@ void Viewport3D::MakeTransform(void)
aViewTf *= aTemp;
}
- bTfValid = TRUE;
+ bTfValid = sal_True;
}
}
@@ -313,7 +313,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
{
aVRP = rNewVRP;
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -326,7 +326,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
{
aVPN = rNewVPN;
aVPN.normalize();
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -338,7 +338,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV)
{
aVUV = rNewVUV;
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -352,7 +352,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
aPRP = rNewPRP;
aPRP.setX(0.0);
aPRP.setY(0.0);
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -364,7 +364,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
void Viewport3D::SetVPD(double fNewVPD)
{
fVPD = fNewVPD;
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -376,7 +376,7 @@ void Viewport3D::SetVPD(double fNewVPD)
void Viewport3D::SetNearClipDist(double fNewNCD)
{
fNearClipDist = fNewNCD;
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
/*************************************************************************
@@ -388,7 +388,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD)
void Viewport3D::SetFarClipDist(double fNewFCD)
{
fFarClipDist = fNewFCD;
- bTfValid = FALSE;
+ bTfValid = sal_False;
}
// eof
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index d6a530db85e3..2fe2c5979766 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2106,7 +2106,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
Window* pGrid = GetWindow();
if ( pGrid )
{
- Reference< XAccessible > xAcc( pGrid->GetAccessible( TRUE ) );
+ Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) );
if ( xAcc.is() )
xContext = xAcc->getAccessibleContext();
// TODO: this has a slight conceptual problem:
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index f855111c0bc1..a8ab835548ac 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
//------------------------------------------------------------------------------
::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::vos::OThread::TThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::vos::OThread::TThreadIdentifier, sal_Int32, ::std::less< ::vos::OThread::TThreadIdentifier > >
Tracer::s_aThreadIndents;
//------------------------------------------------------------------------------
@@ -44,13 +44,13 @@ Tracer::Tracer(const char* _pBlockDescription)
:m_sBlockDescription(_pBlockDescription)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
+ sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -64,13 +64,13 @@ Tracer::Tracer(const char* _pBlockDescription)
Tracer::~Tracer()
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ sal_Int32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -84,13 +84,13 @@ Tracer::~Tracer()
void Tracer::TraceString(const char* _pMessage)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
@@ -105,13 +105,13 @@ void Tracer::TraceString(const char* _pMessage)
void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
{
::vos::OGuard aGuard(s_aMapSafety);
- INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+ sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
ByteString sIndent;
while (nIndent--)
sIndent += '\t';
- ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+ ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
sThread += '\t';
ByteString sMessage(sThread);
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index b2d67e9b66ea..4bd58c0b0736 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -78,13 +78,13 @@ namespace svx
void updateSet();
/** builds the descriptor from a property value sequence
- @return <TRUE/>
+ @return <sal_True/>
if and only if the sequence contained valid properties only
*/
sal_Bool buildFrom( const Sequence< PropertyValue >& _rValues );
/** builds the descriptor from a property set
- @return <TRUE/>
+ @return <sal_True/>
if and only if the set contained valid properties only
*/
sal_Bool buildFrom( const Reference< XPropertySet >& _rValues );
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 3c59ac47912f..6cc874112e94 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -61,7 +61,7 @@ namespace svxform
//--------------------------------------------------------------------
ODbtoolsClient::ODbtoolsClient()
{
- m_bCreateAlready = FALSE;
+ m_bCreateAlready = sal_False;
}
//--------------------------------------------------------------------
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3b910652a96b..d9f64d068cbb 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1268,7 +1268,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
if (aText.Len() == 0)
{
// deleting the entry asynchron
- ULONG nEvent;
+ sal_uLong nEvent;
PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnRemove), pEntry);
}
else
@@ -1922,7 +1922,7 @@ void FmFilterNavigator::DeleteSelection()
}
// Remove the selection
- SelectAll(FALSE);
+ SelectAll(sal_False);
for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin();
// link problems with operator ==
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 039c3361491d..dc6a141e45e9 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -286,7 +286,7 @@ void FmEntryData::Clear()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmEntryData::Clear" );
for (;;)
{
- FmEntryData* pEntryData = GetChildList()->Remove(ULONG(0));
+ FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0));
if (pEntryData == NULL)
break;
delete pEntryData;
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 2c2999ee34ea..480bc5678eaf 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -171,7 +171,7 @@ SdrPage* FmFormPage::Clone() const
}
//------------------------------------------------------------------
-void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
+void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
const SdrInsertReason* pReason)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" );
@@ -270,7 +270,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
}
//------------------------------------------------------------------
-SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
+SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" );
SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 154999333296..69dc527128a0 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -113,7 +113,7 @@ namespace svxform
the name of the method at the interface determined by _rListenerType
@return
- <TRUE/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously
+ <sal_True/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously
*/
bool impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e767f7c0b112..112b47b1107e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -868,7 +868,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
rReq.Done();
// initially open the filter navigator, the whole form based filter is pretty useless without it
- SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE );
+ SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
&aIdentifierItem, NULL );
} break;
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 2065295006e9..bd788b731280 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -298,7 +298,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel)
+ void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" );
if (IsListening(*m_pFormModel))
@@ -872,7 +872,7 @@ namespace svxform
FmNavRequestSelectHint rshRequestSelection;
sal_Bool bIsMixedSelection = sal_False;
- for (ULONG i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
+ for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
{
SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj();
bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent);
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 37c102cb1954..d8bff05bf599 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -126,9 +126,9 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X
if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
if ( sLabel.getLength() )
- _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
else
- _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+ _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
}
}
//==================================================================
@@ -165,7 +165,7 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
}
//------------------------------------------------------------------------------
-BOOL FmFieldWinListBox::DoubleClickHdl()
+sal_Bool FmFieldWinListBox::DoubleClickHdl()
{
if ( pTabWin->createSelectionControls() )
return sal_True;
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e1f7f38b9e33..dfa4eaad4a9d 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -186,7 +186,7 @@ GalleryBrowser1::~GalleryBrowser1()
sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
{
- static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
+ static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND;
@@ -263,7 +263,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
if( pTheme )
{
sal_Bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
- static const BOOL bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
+ static const sal_Bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
if( pTheme->IsReadOnly() )
bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index d2a928bffb63..5dd531de8090 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,7 +69,7 @@ namespace svxform
private:
Link m_aHandler;
- ULONG m_nEventId;
+ sal_uLong m_nEventId;
private:
DECL_LINK( OnCall, void* );
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index df4e2b8559a6..10a290cd2b04 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -318,7 +318,7 @@ private:
@param _pTargetItems
The target where to insert the items.
@param _bCopy
- If <TRUE/> the items will not be removed from the model, otherwise they will.
+ If <sal_True/> the items will not be removed from the model, otherwise they will.
*/
void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False);
SvLBoxEntry* getPrevEntry(SvLBoxEntry* _pStartWith = NULL);
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 487c9287c972..598e9d61196a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -390,7 +390,7 @@ namespace svxform
void ClearBranch( FmFormData* pParentData );
void UpdateContent( FmFormShell* pNewShell );
- void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND,
+ void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND,
sal_Bool bAlterModel = sal_False );
void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
@@ -440,7 +440,7 @@ namespace svxform
SvLBoxEntry* m_pRootEntry;
SvLBoxEntry* m_pEditEntry;
- ULONG nEditEvent;
+ sal_uLong nEditEvent;
SELDATA_ITEMS m_sdiState;
Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde
@@ -465,7 +465,7 @@ namespace svxform
sal_Bool IsDeleteAllowed();
FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True );
void NewForm( SvLBoxEntry* pParentEntry );
- SvLBoxEntry* Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND );
+ SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND );
void Remove( FmEntryData* pEntryData );
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 5398973cb6b3..fae15aeb18df 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -45,7 +45,7 @@ class FmFormObj: public SdrUnoObj
// m_pEnvironmentHistory was created
FmFormView* m_pControlCreationView;
- ULONG m_nControlCreationEvent;
+ sal_uLong m_nControlCreationEvent;
// Informationen fuer die Controlumgebung
// werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 755c754853dc..6f3e37e96c3a 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -150,7 +150,7 @@ private:
If <member>xCurrentForm</member> is not valid anymore, it is reset to <NULL/>.
@return
- <TRUE/> if and only if xCurrentForm is valid.
+ <sal_True/> if and only if xCurrentForm is valid.
@since #i40086#
*/
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index e56f9fd64a36..73956dc2925c 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -123,11 +123,11 @@ class FmFormPage;
struct SAL_DLLPRIVATE FmLoadAction
{
FmFormPage* pPage;
- ULONG nEventId;
+ sal_uLong nEventId;
sal_uInt16 nFlags;
FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
- FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId )
+ FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId )
:pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
{
}
@@ -200,8 +200,8 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE
SvLongs m_arrRelativeGridColumn;
::osl::Mutex m_aMutex;
- ULONG m_nInvalidationEvent;
- ULONG m_nActivationEvent;
+ sal_uLong m_nInvalidationEvent;
+ sal_uLong m_nActivationEvent;
::std::queue< FmLoadAction >
m_aLoadingPages;
@@ -364,7 +364,7 @@ protected:
::std::vector< String >& _out_rNames );
/** checks whether the instance is already disposed, if so, this is reported as assertion error (debug
- builds only) and <TRUE/> is returned.
+ builds only) and <sal_True/> is returned.
*/
bool impl_checkDisposed() const;
@@ -383,7 +383,7 @@ public:
/** announces a new "current selection"
@return
- <TRUE/> if and only if the to-bet-set selection was different from the previous selection
+ <sal_True/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelection( const InterfaceBag& _rSelection );
@@ -397,7 +397,7 @@ public:
/** sets a new current selection as indicated by a mark list
@return
- <TRUE/> if and only if the to-bet-set selection was different from the previous selection
+ <sal_True/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
@@ -450,7 +450,7 @@ public:
/// executes a control conversion slot for a given object
bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId );
/** executes a control conversion slot for the current selection
- @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/>
+ @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <sal_True/>
*/
bool executeControlConversionSlot( sal_uInt16 _nSlotId );
/// checks whether the given slot id denotes a control conversion slot
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index b0f42a0e97ea..6ed0a8512158 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -460,7 +460,7 @@ namespace svxform
one will be used. Else, an attempt is made to create an <type scope="com::sun::star::sdb">InteractionHandler</type>
is made.
- @return <TRUE/>
+ @return <sal_True/>
if and only if <member>m_xInteractionHandler</member> is valid when the method returns
*/
bool ensureInteractionHandler();
@@ -476,7 +476,7 @@ namespace svxform
@param _rxNewControl
The control which should replace the existent control.
@return
- <TRUE/> if and only if the control was successfully replaced
+ <sal_True/> if and only if the control was successfully replaced
*/
bool replaceControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl,
@@ -552,15 +552,15 @@ namespace svxform
valid.
@param _rFirstInvalidityExplanation
- if the method returns <FALSE/> (i.e. if there is an invalid control), this string contains
+ if the method returns <sal_False/> (i.e. if there is an invalid control), this string contains
the explanation for the invalidity, as obtained from the validator.
@param _rxFirstInvalidModel
- if the method returns <FALSE/> (i.e. if there is an invalid control), this contains
+ if the method returns <sal_False/> (i.e. if there is an invalid control), this contains
the control model
@return
- <TRUE/> if and only if all controls belonging to our form are valid
+ <sal_True/> if and only if all controls belonging to our form are valid
*/
bool checkFormComponentValidity(
::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation,
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index acead19ba9ee..67c76e9142b2 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -831,7 +831,7 @@ public:
protected:
virtual Window* getEventWindow() const;
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
// default implementations call our focus listeners, don't forget to call them if you override this
virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -871,15 +871,15 @@ protected:
/** determines whether the text of this cell can be painted directly, without
using the painter control
- If this is <TRUE/>, the <member>PaintCell</member> method will simply use the text as returned
+ If this is <sal_True/>, the <member>PaintCell</member> method will simply use the text as returned
by <member>GetText</member>, and draw it onto the device passed to <member>PaintFieldToCell</member>,
while respecting the current alignment settings.
- If this is <FALSE/>, the <member>PaintFieldToCell</member> request will be forwarded to the painter
+ If this is <sal_False/>, the <member>PaintFieldToCell</member> request will be forwarded to the painter
control (<member>m_pPainter</member>). This is more expensive, but the only option
if your painting involves more that a simple DrawText.
- This member is <TRUE/> by default, and can be modified by derived classes.
+ This member is <sal_True/> by default, and can be modified by derived classes.
*/
sal_Bool m_bFastPaint;
@@ -947,7 +947,7 @@ public:
virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -999,7 +999,7 @@ public:
protected:
virtual Window* getEventWindow() const;
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
};
//==================================================================
@@ -1051,7 +1051,7 @@ public:
virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
DECL_LINK( OnDoubleClick, void* );
};
@@ -1096,7 +1096,7 @@ public:
virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
};
//==================================================================
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index f02848835ffd..d2048a0f2644 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -104,19 +104,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
- sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pColorTable );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -124,7 +124,7 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pColorTable = (XColorTable *)(ULONG)aValue;
+ pColorTable = (XColorTable *)(sal_uLong)aValue;
return sal_True;
}
@@ -188,19 +188,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
- sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pGradientList );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -208,7 +208,7 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BY
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pGradientList = (XGradientList *)(ULONG)aValue;
+ pGradientList = (XGradientList *)(sal_uLong)aValue;
return sal_True;
}
@@ -272,19 +272,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
- sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pHatchList );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -292,7 +292,7 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pHatchList = (XHatchList *)(ULONG)aValue;
+ pHatchList = (XHatchList *)(sal_uLong)aValue;
return sal_True;
}
@@ -356,19 +356,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
- sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pBitmapList );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -376,7 +376,7 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pBitmapList = (XBitmapList *)(ULONG)aValue;
+ pBitmapList = (XBitmapList *)(sal_uLong)aValue;
return sal_True;
}
@@ -442,25 +442,25 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
- sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pDashList );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pDashList = (XDashList *)(ULONG)aValue;
+ pDashList = (XDashList *)(sal_uLong)aValue;
return sal_True;
}
@@ -531,25 +531,25 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
- sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
+ sal_Int64 aValue = sal_Int64( (sal_uLong)pLineEndList );
rVal = uno::makeAny( aValue );
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = 0;
if ( rVal >>= aValue )
{
- pLineEndList = (XLineEndList *)(ULONG)aValue;
+ pLineEndList = (XLineEndList *)(sal_uLong)aValue;
return sal_True;
}
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 987f5aa6df08..8b4c36ab5eac 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -360,7 +360,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
pMacroTable = new SvxMacroTableDtor ( rTbl );
}
-BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -382,13 +382,13 @@ BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
rVal <<= (sal_Int32) eType;
break;
default:
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -422,9 +422,9 @@ BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
break;
default:
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index bc5438d23686..38ad3f6d9e7b 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -117,7 +117,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
eType == rItem.GetType() );
}
-sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -147,7 +147,7 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId
return sal_True;
}
-sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -184,7 +184,7 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
if ( bAllConverted && nConvertedCount == ZOOM_PARAMS )
{
- SetValue( (UINT16)nValueTmp );
+ SetValue( (sal_uInt16)nValueTmp );
nValueSet = nValueSetTmp;
eType = SvxZoomType( nTypeTmp );
return sal_True;
@@ -199,7 +199,7 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
sal_Int32 nVal = 0;
if ( rVal >>= nVal )
{
- SetValue( (UINT16)nVal );
+ SetValue( (sal_uInt16)nVal );
return sal_True;
}
else
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 3f849e92b462..a981d1691b3d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -656,7 +656,7 @@ namespace sdr { namespace contact {
/** determines whether or not our control is printable
Effectively, this method returns the value of the "Printable" property
- of the control's model. If we have no control, <FALSE/> is returned.
+ of the control's model. If we have no control, <sal_False/> is returned.
*/
bool isPrintableControl() const;
@@ -721,7 +721,7 @@ namespace sdr { namespace contact {
a reference to a pointer holding, upon return, the desired SdrPageView
@return
- <TRUE/> if and only if a ->SdrPageView could be obtained
+ <sal_True/> if and only if a ->SdrPageView could be obtained
@precond
We really belong to an SdrPageViewWindow. Perhaps (I'm not sure ATM :)
@@ -732,7 +732,7 @@ namespace sdr { namespace contact {
We're not disposed.
@postcond
- The method expects success, if it returns with <FALSE/>, this will have been
+ The method expects success, if it returns with <sal_False/>, this will have been
asserted.
@nothrow
@@ -742,7 +742,7 @@ namespace sdr { namespace contact {
/** adjusts the control visibility so it respects its layer's visibility
@param _bForce
- set to <TRUE/> if you want to force a ->XWindow::setVisible call,
+ set to <sal_True/> if you want to force a ->XWindow::setVisible call,
no matter if the control visibility is already correct
@precond
@@ -776,10 +776,10 @@ namespace sdr { namespace contact {
determines whether the control is currently visible. Note that this is only a shortcut for
querying _rxControl for the XWindow2 interface, and calling isVisible at this interface.
This shortcut has been chosen since the caller usually already has this information.
- If _bForce is <TRUE/>, _bIsCurrentlyVisible is ignored.
+ If _bForce is <sal_True/>, _bIsCurrentlyVisible is ignored.
@param _bForce
- set to <TRUE/> if you want to force a ->XWindow::setVisible call,
+ set to <sal_True/> if you want to force a ->XWindow::setVisible call,
no matter if the control visibility is already correct
@precond
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4ff335a04125..8b86f9dec9ce 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -560,7 +560,7 @@ namespace drawinglayer
{
const SfxPoolItem* pGradientItem;
- if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, TRUE, &pGradientItem)
+ if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem)
&& ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
{
// test if float transparence is completely transparent
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 0f3325a0027e..39b78849ad7e 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -277,7 +277,7 @@ namespace sdr
ImpRemoveStyleSheet();
}
- mpItemSet = mpItemSet->Clone(FALSE, pDestPool);
+ mpItemSet = mpItemSet->Clone(sal_False, pDestPool);
GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel);
// set stylesheet (if used)
@@ -380,7 +380,7 @@ namespace sdr
while(pSheet)
{
pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask());
- pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), FALSE);
+ pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False);
if(bScaleUnitChanged)
{
@@ -451,7 +451,7 @@ namespace sdr
while(nWhich)
{
- if(mpItemSet->GetItemState(nWhich, FALSE) == SFX_ITEM_SET)
+ if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET)
{
pNewSet->Put(mpItemSet->Get(nWhich));
}
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 005ba0b19789..7d51b26a0051 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -62,7 +62,7 @@ namespace sdr
{
if(rProps.mpItemSet)
{
- mpItemSet = rProps.mpItemSet->Clone(TRUE);
+ mpItemSet = rProps.mpItemSet->Clone(sal_True);
// do not keep parent info, this may be changed by later construrtors.
// This class just copies the ItemSet, ignore parent.
@@ -162,7 +162,7 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem))
{
if(AllowItemChange(nWhich, pPoolItem))
{
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 3ee3189ac4a8..6fbf34968f3c 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
// and always equal.
if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
{
mpItemSet->InvalidateItem(nWhich);
}
else
{
- mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+ mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
}
}
@@ -131,7 +131,7 @@ namespace sdr
{
// Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
// #i50808# Leak fix, Clone produces a new instance and we get ownership here
- SfxItemSet* pNewSet = rSet.Clone(TRUE);
+ SfxItemSet* pNewSet = rSet.Clone(sal_True);
DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
@@ -319,13 +319,13 @@ namespace sdr
Camera3D aSceneCam(rObj.GetCamera());
// ProjectionType
- mpItemSet->Put(Svx3DPerspectiveItem((UINT16)aSceneCam.GetProjection()));
+ mpItemSet->Put(Svx3DPerspectiveItem((sal_uInt16)aSceneCam.GetProjection()));
// CamPos
- mpItemSet->Put(Svx3DDistanceItem((UINT32)(aSceneCam.GetPosition().getZ() + 0.5)));
+ mpItemSet->Put(Svx3DDistanceItem((sal_uInt32)(aSceneCam.GetPosition().getZ() + 0.5)));
// FocalLength
- mpItemSet->Put(Svx3DFocalLengthItem((UINT32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
+ mpItemSet->Put(Svx3DFocalLengthItem((sal_uInt32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
}
} // end of namespace properties
} // end of namespace sdr
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 76eacd537c27..3afdb66c6daf 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -128,7 +128,7 @@ namespace sdr
mpItemSet->Put( SdrGrafBlueItem( 0 ) );
mpItemSet->Put( SdrGrafGamma100Item( 100 ) );
mpItemSet->Put( SdrGrafTransparenceItem( 0 ) );
- mpItemSet->Put( SdrGrafInvertItem( FALSE ) );
+ mpItemSet->Put( SdrGrafInvertItem( sal_False ) );
mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) );
mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 9761946d15b3..d55d8dcb1a16 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -102,13 +102,13 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
{
mpItemSet->InvalidateItem(nWhich);
}
else
{
- mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+ mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
}
nWhich = aIter.NextWhich();
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 37678966bc07..1e804b9716df 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -127,7 +127,7 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem))
{
if(pItem->HasMetrics())
{
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 8c935c2700f0..522f3e44e686 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -117,9 +117,9 @@ namespace sdr
GetObjectItemSet();
//#71958# by default, the show units Bool-Item is set as hard
- // attribute to TRUE to aviod confusion when copying SdrMeasureObj's
+ // attribute to sal_True to aviod confusion when copying SdrMeasureObj's
// from one application to another
- mpItemSet->Put(SdrMeasureShowUnitItem(TRUE));
+ mpItemSet->Put(SdrMeasureShowUnitItem(sal_True));
basegfx::B2DPolygon aNewPolygon;
aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 091656e1f261..b7f2cc5474e6 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -488,7 +488,7 @@ namespace sdr
if(bHasURL)
{
SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR );
- aColorSet.Put(aSet, FALSE);
+ aColorSet.Put(aSet, sal_False);
ESelection aSel((sal_uInt16)nPara, 0);
@@ -519,7 +519,7 @@ namespace sdr
}
- aSet.Put(aParaSet, FALSE);
+ aSet.Put(aParaSet, sal_False);
if(bHasURL)
{
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index d02b86ad3920..094cfbd96ee5 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -159,7 +159,7 @@ struct SvxPosSizeStatusBarControl_Impl
Size aSize; // g"ultig, wenn eine Gr"o/se angezeigt wird
String aStr; // g"ultig, wenn ein Text angezeigt wird
sal_Bool bPos; // show position
- BOOL bSize; // Gr"o/se anzeigen?
+ sal_Bool bSize; // Gr"o/se anzeigen?
sal_Bool bTable; // Tabellenindex anzeigen?
sal_Bool bHasMenu; // StarCalc Popup-Menue anzeigen?
sal_uInt16 nFunction; // selektierte StarCalc Funktion
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index bae8ca9c188c..b09b7de83c18 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -104,7 +104,7 @@ void CloneList::CopyConnections() const
if(pOriginalNode1)
{
- ULONG nPos(maOriginalList.GetPos(pOriginalNode1));
+ sal_uLong nPos(maOriginalList.GetPos(pOriginalNode1));
if(LIST_ENTRY_NOTFOUND != nPos)
{
@@ -117,7 +117,7 @@ void CloneList::CopyConnections() const
if(pOriginalNode2)
{
- ULONG nPos(maOriginalList.GetPos(pOriginalNode2));
+ sal_uLong nPos(maOriginalList.GetPos(pOriginalNode2));
if(LIST_ENTRY_NOTFOUND != nPos)
{
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 74d8fd10a402..c21d0e7bc631 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -49,20 +49,20 @@ void SdrDragStat::Reset()
{
pView=NULL;
pPageView=NULL;
- bShown=FALSE;
+ bShown=sal_False;
nMinMov=1;
- bMinMoved=FALSE;
- bHorFixed=FALSE;
- bVerFixed=FALSE;
- bWantNoSnap=FALSE;
+ bMinMoved=sal_False;
+ bHorFixed=sal_False;
+ bVerFixed=sal_False;
+ bWantNoSnap=sal_False;
pHdl=NULL;
- bOrtho4=FALSE;
- bOrtho8=FALSE;
+ bOrtho4=sal_False;
+ bOrtho8=sal_False;
pDragMethod=NULL;
- bEndDragChangesAttributes=FALSE;
- bEndDragChangesGeoAndAttributes=FALSE;
- bMouseIsUp=FALSE;
- Clear(TRUE);
+ bEndDragChangesAttributes=sal_False;
+ bEndDragChangesGeoAndAttributes=sal_False;
+ bMouseIsUp=sal_False;
+ Clear(sal_True);
aActionRect=Rectangle();
}
@@ -114,7 +114,7 @@ FASTBOOL SdrDragStat::CheckMinMoved(const Point& rPnt)
long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx;
long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy;
if (dx>=long(nMinMov) || dy>=long(nMinMov))
- bMinMoved=TRUE;
+ bMinMoved=sal_True;
}
return bMinMoved;
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d41b5b1a1c34..84d3d56a5edf 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1575,13 +1575,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
{ // Klebepunkte aufs BoundRect des Obj limitieren
aPt1-=DragStat().GetStart();
const SdrMarkList& rML=GetMarkedObjectList();
- ULONG nMarkAnz=rML.GetMarkCount();
+ sal_uLong nMarkAnz=rML.GetMarkCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+ for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
{
const SdrMark* pM=rML.GetMark(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
if (nPtAnz!=0)
{
@@ -1589,7 +1589,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
const SdrGluePointList* pGPL=pObj->GetGluePointList();
Rectangle aBound(pObj->GetCurrentBoundRect());
- for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+ for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++)
{
sal_uInt16 nId=pPts->GetObject(nPtNum);
sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId);
@@ -1678,12 +1678,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
Fraction aFact1(1,1);
Point aStart(DragStat().GetStart());
Point aRef(DragStat().GetRef1());
- INT32 nXDiv(aStart.X() - aRef.X());
+ sal_Int32 nXDiv(aStart.X() - aRef.X());
if(!nXDiv)
nXDiv = 1;
- INT32 nYDiv(aStart.Y() - aRef.Y());
+ sal_Int32 nYDiv(aStart.Y() - aRef.Y());
if(!nYDiv)
nYDiv = 1;
@@ -2020,7 +2020,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
rStr.AppendAscii(" (");
XubString aStr;
- INT32 nTmpWink(NormAngle360(nWink));
+ sal_Int32 nTmpWink(NormAngle360(nWink));
if(bRight && nWink)
{
@@ -2156,7 +2156,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
ImpTakeDescriptionStr(STR_DragMethShear, rStr);
rStr.AppendAscii(" (");
- INT32 nTmpWink(nWink);
+ sal_Int32 nTmpWink(nWink);
if(bUpSideDown)
nTmpWink += 18000;
@@ -2748,7 +2748,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
rStr.AppendAscii(" (");
XubString aStr;
- INT32 nVal(nWink);
+ sal_Int32 nVal(nWink);
if(bAtCenter)
nVal *= 2;
@@ -3343,9 +3343,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
if (bCopy)
getSdrDragView().CopyMarkedObj();
- ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ for (sal_uLong nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index e976150a2b15..ea2b67ca12f6 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -351,7 +351,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
}
else
{
- if (!IsMirrorAllowed(sal_True,TRUE)) return sal_False;
+ if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMirror(*this);
}
} break;
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 2562b81efa8d..abe434aa215b 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -57,11 +57,11 @@ public:
{}
void Clear() { aList.Clear(); }
- ULONG GetObjCount() const { return aList.Count(); }
- SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
- SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
- void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
- void RemoveObject(ULONG nPos) { aList.Remove(nPos); }
+ sal_uLong GetObjCount() const { return aList.Count(); }
+ SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+ SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+ void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
+ void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); }
};
//************************************************************
@@ -74,7 +74,7 @@ protected:
SdrObjRefList aTmpList;
VirtualDevice aVD;
Rectangle aScaleRect;
- ULONG nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
+ sal_uLong nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
SfxItemSet* pLineAttr;
SfxItemSet* pFillAttr;
SfxItemSet* pTextAttr;
@@ -130,19 +130,19 @@ protected:
void DoAction(MetaFillColorAction & rAct) { rAct.Execute(&aVD); }
void DoAction(MetaTextColorAction & rAct) { rAct.Execute(&aVD); }
void DoAction(MetaTextFillColorAction & rAct) { rAct.Execute(&aVD); }
- void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
- void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+ void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
+ void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
void DoAction(MetaClipRegionAction & rAct) { rAct.Execute(&aVD); }
void DoAction(MetaRasterOpAction & rAct) { rAct.Execute(&aVD); }
void DoAction(MetaPushAction & rAct) { rAct.Execute(&aVD); }
- void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+ void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
void DoAction(MetaMoveClipRegionAction & rAct) { rAct.Execute(&aVD); }
void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); }
void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); }
void DoAction(MetaCommentAction& rAct, GDIMetaFile* pMtf);
void ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct );
- void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=FALSE);
+ void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=sal_False);
void InsertObj( SdrObject* pObj, sal_Bool bScale = sal_True );
void MapScaling();
@@ -153,7 +153,7 @@ protected:
public:
ImpSdrGDIMetaFileImport(SdrModel& rModel);
~ImpSdrGDIMetaFileImport();
- ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
+ sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
void SetLayer(SdrLayerID nLay) { nLayer=nLay; }
SdrLayerID GetLayer() const { return nLayer; }
void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 0668b8f69210..a951819104aa 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1182,7 +1182,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
XubString aNewText(pBrowse->GetNewEntryValue());
- BOOL bDel( aNewText.EqualsAscii("del")
+ sal_Bool bDel( aNewText.EqualsAscii("del")
|| aNewText.EqualsAscii("Del")
|| aNewText.EqualsAscii("DEL")
|| aNewText.EqualsAscii("default")
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index d61654e674ea..8949b1418f94 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -74,7 +74,7 @@ void SdrUShortCont::Sort() const
aSort.DoSort();
((SdrUShortCont*)this)->mbSorted = sal_True;
- ULONG nNum(GetCount());
+ sal_uLong nNum(GetCount());
if(nNum > 1)
{
@@ -96,9 +96,9 @@ void SdrUShortCont::Sort() const
}
}
-void SdrUShortCont::CheckSort(ULONG nPos)
+void SdrUShortCont::CheckSort(sal_uLong nPos)
{
- ULONG nAnz(maArray.Count());
+ sal_uLong nAnz(maArray.Count());
if(nPos > nAnz)
nPos = nAnz;
@@ -343,7 +343,7 @@ int ImpSdrMarkListSorter::Compare(const void* pElem1, const void* pElem2) const
if (pOL1 == pOL2)
{
- // AF: Note that I reverted a change from sal_uInt32 to ULONG (made
+ // AF: Note that I reverted a change from sal_uInt32 to sal_uLong (made
// for 64bit compliance, #i78198#) because internally in SdrObject
// both nOrdNum and mnNavigationPosition are stored as sal_uInt32.
sal_uInt32 nObjOrd1((pObj1) ? pObj1->GetNavigationPosition() : 0);
@@ -372,7 +372,7 @@ void SdrMarkList::ImpForceSort()
if(!mbSorted)
{
mbSorted = sal_True;
- ULONG nAnz = maList.Count();
+ sal_uLong nAnz = maList.Count();
// remove invalid
if(nAnz > 0 )
@@ -431,7 +431,7 @@ void SdrMarkList::ImpForceSort()
void SdrMarkList::Clear()
{
- for(ULONG i(0L); i < GetMarkCount(); i++)
+ for(sal_uLong i(0L); i < GetMarkCount(); i++)
{
SdrMark* pMark = GetMark(i);
delete pMark;
@@ -445,7 +445,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
{
Clear();
- for(ULONG i(0L); i < rLst.GetMarkCount(); i++)
+ for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++)
{
SdrMark* pMark = rLst.GetMark(i);
SdrMark* pNeuMark = new SdrMark(*pMark);
@@ -461,7 +461,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
mbSorted = rLst.mbSorted;
}
-ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
+sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const
{
// #109658#
//
@@ -476,7 +476,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
// less dangerous to change this method then changing SdrObject::GetOrdNum().
if(pObj && maList.Count())
{
- for(ULONG a(0L); a < maList.Count(); a++)
+ for(sal_uLong a(0L); a < maList.Count(); a++)
{
if(((SdrMark*)(maList.GetObject(a)))->GetMarkedSdrObj() == pObj)
{
@@ -491,7 +491,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
{
SetNameDirty();
- ULONG nAnz(maList.Count());
+ sal_uLong nAnz(maList.Count());
if(!bChkSort || !mbSorted || nAnz == 0)
{
@@ -502,7 +502,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
}
else
{
- SdrMark* pLast = GetMark(ULONG(nAnz - 1));
+ SdrMark* pLast = GetMark(sal_uLong(nAnz - 1));
const SdrObject* pLastObj = pLast->GetMarkedSdrObj();
const SdrObject* pNeuObj = rMark.GetMarkedSdrObj();
@@ -527,8 +527,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
if(pLastOL == pNeuOL)
{
- const ULONG nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
- const ULONG nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
+ const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
+ const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
if(nNeuNum < nLastNum)
{
@@ -547,7 +547,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
return;
}
-void SdrMarkList::DeleteMark(ULONG nNum)
+void SdrMarkList::DeleteMark(sal_uLong nNum)
{
SdrMark* pMark = GetMark(nNum);
DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry nicht gefunden");
@@ -560,7 +560,7 @@ void SdrMarkList::DeleteMark(ULONG nNum)
}
}
-void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
+void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum)
{
SdrMark* pMark = GetMark(nNum);
DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry nicht gefunden");
@@ -577,7 +577,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
{
- ULONG nAnz(rSrcList.maList.Count());
+ sal_uLong nAnz(rSrcList.maList.Count());
if(rSrcList.mbSorted)
{
@@ -587,7 +587,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
if(!bReverse)
{
- for(ULONG i(0L); i < nAnz; i++)
+ for(sal_uLong i(0L); i < nAnz; i++)
{
SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
InsertEntry(*pM);
@@ -595,7 +595,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
}
else
{
- for(ULONG i(nAnz); i > 0;)
+ for(sal_uLong i(nAnz); i > 0;)
{
i--;
SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
@@ -608,7 +608,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
{
sal_Bool bChgd(sal_False);
- for(ULONG i(GetMarkCount()); i > 0; )
+ for(sal_uLong i(GetMarkCount()); i > 0; )
{
i--;
SdrMark* pMark = GetMark(i);
@@ -631,9 +631,9 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
DeletePageView(rPV); // erstmal alle raus, dann die ganze Seite hinten dran
SdrObject* pObj;
const SdrObjList* pOL = rPV.GetObjList();
- ULONG nObjAnz(pOL->GetObjCount());
+ sal_uLong nObjAnz(pOL->GetObjCount());
- for(ULONG nO(0L); nO < nObjAnz; nO++)
+ for(sal_uLong nO(0L); nO < nObjAnz; nO++)
{
pObj = pOL->GetObj(nO);
sal_Bool bDoIt(rPV.IsObjMarkable(pObj));
@@ -652,7 +652,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
const XubString& SdrMarkList::GetMarkDescription() const
{
- ULONG nAnz(GetMarkCount());
+ sal_uLong nAnz(GetMarkCount());
if(mbNameOk && 1L == nAnz)
{
@@ -690,7 +690,7 @@ const XubString& SdrMarkList::GetMarkDescription() const
XubString aStr1;
sal_Bool bEq(sal_True);
- for(ULONG i = 1; i < GetMarkCount() && bEq; i++)
+ for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++)
{
SdrMark* pMark2 = GetMark(i);
pMark2->GetMarkedSdrObj()->TakeObjNamePlural(aStr1);
@@ -718,16 +718,16 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
{
sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName);
- ULONG nMarkAnz(GetMarkCount());
- ULONG nMarkPtAnz(0L);
- ULONG nMarkPtObjAnz(0L);
- ULONG n1stMarkNum(ULONG_MAX);
+ sal_uLong nMarkAnz(GetMarkCount());
+ sal_uLong nMarkPtAnz(0L);
+ sal_uLong nMarkPtObjAnz(0L);
+ sal_uLong n1stMarkNum(ULONG_MAX);
- for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+ for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
{
const SdrMark* pMark = GetMark(nMarkNum);
const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints();
- ULONG nAnz(pPts ? pPts->GetCount() : 0);
+ sal_uLong nAnz(pPts ? pPts->GetCount() : 0);
if(nAnz)
{
@@ -786,7 +786,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
XubString aStr1;
sal_Bool bEq(sal_True);
- for(ULONG i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++)
+ for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++)
{
const SdrMark* pMark2 = GetMark(i);
const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints();
@@ -832,7 +832,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
sal_Bool bFnd(sal_False);
Rectangle aR;
- for(ULONG i(0L); i < GetMarkCount(); i++)
+ for(sal_uLong i(0L); i < GetMarkCount(); i++)
{
SdrMark* pMark = GetMark(i);
@@ -862,7 +862,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
{
sal_Bool bFnd(sal_False);
- for(ULONG i(0L); i < GetMarkCount(); i++)
+ for(sal_uLong i(0L); i < GetMarkCount(); i++)
{
SdrMark* pMark = GetMark(i);
@@ -953,7 +953,7 @@ namespace sdr
{
SdrObjList* pList = pObj->GetSubList();
- for(ULONG a(0L); a < pList->GetObjCount(); a++)
+ for(sal_uLong a(0L); a < pList->GetObjCount(); a++)
{
SdrObject* pObj2 = pList->GetObj(a);
ImplCollectCompleteSelection(pObj2);
@@ -975,9 +975,9 @@ namespace sdr
maAllMarkedObjects.Clear();
// #126320# GetMarkCount after ForceSort
- const ULONG nMarkAnz(maMarkedObjectList.GetMarkCount());
+ const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount());
- for(ULONG a(0L); a < nMarkAnz; a++)
+ for(sal_uLong a(0L); a < nMarkAnz; a++)
{
SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 8d360e67bed0..26dfb41de180 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -65,7 +65,7 @@ SdrMediaObj::~SdrMediaObj()
FASTBOOL SdrMediaObj::HasTextEdit() const
{
- return FALSE;
+ return sal_False;
}
// ------------------------------------------------------------------------------
@@ -103,9 +103,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
// ------------------------------------------------------------------------------
-UINT16 SdrMediaObj::GetObjIdentifier() const
+sal_uInt16 SdrMediaObj::GetObjIdentifier() const
{
- return UINT16( OBJ_MEDIA );
+ return sal_uInt16( OBJ_MEDIA );
}
// ------------------------------------------------------------------------------
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index dbe19ac40efe..1897d2765678 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -144,27 +144,27 @@ void SdrPageObj::SetBoundRectDirty()
// not re-creatable view data
}
-UINT16 SdrPageObj::GetObjIdentifier() const
+sal_uInt16 SdrPageObj::GetObjIdentifier() const
{
- return UINT16(OBJ_PAGE);
+ return sal_uInt16(OBJ_PAGE);
}
void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoOrthoDesired =FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoOrthoDesired =sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
}
void SdrPageObj::operator=(const SdrObject& rObj)
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 0e4feeedd2f3..845df672d834 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -211,7 +211,7 @@ FASTBOOL SdrTextObj::BegCreate(SdrDragStat& rStat)
aRect1.Justify();
rStat.SetActionRect(aRect1);
aRect = aRect1;
- return TRUE;
+ return sal_True;
}
FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat)
@@ -222,11 +222,11 @@ FASTBOOL SdrTextObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect=aRect1; // fuer ObjName
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
+ bSnapRectDirty=sal_True;
if (HAS_BASE(SdrRectObj,this)) {
((SdrRectObj*)this)->SetXPolyDirty();
}
- return TRUE;
+ return sal_True;
}
FASTBOOL SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -262,7 +262,7 @@ void SdrTextObj::BrkCreate(SdrDragStat& /*rStat*/)
FASTBOOL SdrTextObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return TRUE;
+ return sal_True;
}
basegfx::B2DPolyPolygon SdrTextObj::TakeCreatePoly(const SdrDragStat& rDrag) const
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f53d1009b805..4063d0bfe83d 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1147,8 +1147,8 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
}
sal_Bool bNo=sal_False;
- if (!IsMirrorAllowed(sal_True,TRUE)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt
- if (!IsMirrorAllowed(sal_False,FALSE) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt
+ if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt
+ if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt
if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True; // Spiegeln hor/ver erlaubt
if (bNo) return Pointer(POINTER_NOTALLOWED);
if (b90) {
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index ceb192e85683..c33b4d8c84b3 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -134,7 +134,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
if(!aObjLay.IsEmpty())
{
- return TRUE;
+ return sal_True;
} // ansonsten die naechste MasterPage der Page ansehen...
}
else
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index 8ced09bc587f..40f22ef8ea09 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -161,7 +161,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener;
- ULONG mnUpdateEvent;
+ sal_uLong mnUpdateEvent;
};
} }
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index d155e084fff8..6fdb0f6c8be7 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -64,7 +64,7 @@ class SdrTableRtfExporter
{
public:
SdrTableRtfExporter( SvStream& rStrmP, SdrTableObj& rObj );
- ULONG Write();
+ sal_uLong Write();
void WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart );
void WriteCell( sal_Int32 nCol, sal_Int32 nRow );
@@ -95,7 +95,7 @@ long HundMMToTwips( long nIn )
return nRet;
}
-ULONG SdrTableRtfExporter::Write()
+sal_uLong SdrTableRtfExporter::Write()
{
mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine;
@@ -185,7 +185,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
}
mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine;
- ULONG nStrmPos = mrStrm.Tell();
+ sal_uLong nStrmPos = mrStrm.Tell();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
{
WriteCell( nCol, nRow );
@@ -232,7 +232,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
}
bool bResetPar, bResetAttr;
- bResetPar = bResetAttr = FALSE;
+ bResetPar = bResetAttr = sal_False;
SdrTextHorzAdjust eHAdj = xCell->GetTextHorizontalAdjust();
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index d57be9f0994d..9b3f5e293070 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -107,16 +107,16 @@ void CellUndo::Redo()
}
}
-BOOL CellUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool CellUndo::Merge( SfxUndoAction *pNextAction )
{
CellUndo* pNext = dynamic_cast< CellUndo* >( pNextAction );
if( pNext && pNext->mxCell.get() == mxCell.get() )
{
- return TRUE;
+ return sal_True;
}
else
{
- return FALSE;
+ return sal_False;
}
}
@@ -413,7 +413,7 @@ void TableColumnUndo::Redo()
// -----------------------------------------------------------------------------
-BOOL TableColumnUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableColumnUndo::Merge( SfxUndoAction *pNextAction )
{
TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction );
return pNext && pNext->mxCol == mxCol;
@@ -482,7 +482,7 @@ void TableRowUndo::Redo()
// -----------------------------------------------------------------------------
-BOOL TableRowUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableRowUndo::Merge( SfxUndoAction *pNextAction )
{
TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction );
return pNext && pNext->mxRow == mxRow;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 617d1737a482..4a54b30c6caa 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -457,7 +457,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw()
drawing::LineDash aLineDash;
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -477,7 +477,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -616,8 +616,8 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro
awt::Gradient aGradient;
aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient.Angle = (short)aXGradient.GetAngle();
aGradient.Border = aXGradient.GetBorder();
aGradient.XOffset = aXGradient.GetXOffset();
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 48357f873ce3..6b54a1458307 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -100,11 +100,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam
uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException )
@@ -132,7 +132,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
if( hasByName( aName ) )
throw container::ElementExistException();
- INT32 nColor = 0;
+ sal_Int32 nColor = 0;
if( !(aElement >>= nColor) )
throw lang::IllegalArgumentException();
@@ -157,7 +157,7 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
- INT32 nColor = 0;
+ sal_Int32 nColor = 0;
if( !(aElement >>= nColor) )
throw lang::IllegalArgumentException();
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 195411b1e944..016128488ab4 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -192,11 +192,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
if( ServiceSpecifier.compareTo( aDrawingPrefix, aDrawingPrefix.getLength() ) == 0 )
{
- UINT32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier );
+ sal_uInt32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier );
if( nType != UHASHMAP_NOTFOUND )
{
- UINT16 nT = (UINT16)(nType & ~E3D_INVENTOR_FLAG);
- UINT32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
+ sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG);
+ sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) );
}
@@ -225,7 +225,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
{
UHashMapEntry* pMap = pSdrShapeIdentifierMap;
- UINT32 nCount = 0;
+ sal_uInt32 nCount = 0;
while (pMap->aIdentifier.getLength())
{
pMap++;
@@ -236,7 +236,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
OUString* pStrings = aSeq.getArray();
pMap = pSdrShapeIdentifierMap;
- UINT32 nIdx = 0;
+ sal_uInt32 nIdx = 0;
while(pMap->aIdentifier.getLength())
{
pStrings[nIdx] = pMap->aIdentifier;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index a905aa0fd2f4..1efb94886194 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -625,7 +625,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
aNewPolygon.setClosed(true);
pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
- // #107245# pObj->SetExtrudeCharacterMode(TRUE);
+ // #107245# pObj->SetExtrudeCharacterMode(sal_True);
pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
}
else if(pNewObj->ISA(E3dLatheObj))
@@ -638,7 +638,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
aNewPolygon.setClosed(true);
pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
- // #107245# pObj->SetLatheCharacterMode(TRUE);
+ // #107245# pObj->SetLatheCharacterMode(sal_True);
pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
}
}
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index fd8f9dd1d2d9..be20ca4421e3 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -394,7 +394,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
double fCamFocal =
(double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
- aCam.SetAutoAdjustProjection(FALSE);
+ aCam.SetAutoAdjustProjection(sal_False);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ);
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 46a84bf52fad..0f277467bd1f 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -84,7 +84,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
{
XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem();
- pNewItem->SetEnabled( TRUE );
+ pNewItem->SetEnabled( sal_True );
return pNewItem;
}
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index b04b083f486b..4441e22dbcc0 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -200,14 +200,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
if( !xServiceFactory.is() )
{
DBG_ERROR( "got no service manager" );
- return FALSE;
+ return sal_False;
}
uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
if( !xWriter.is() )
{
DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" );
- return FALSE;
+ return sal_False;
}
uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY );
@@ -231,7 +231,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
}
else
{
- pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+ pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
pMedium->IsRemote();
SvStream* pStream = pMedium->GetOutStream();
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 495fa68fa264..e8958bf82479 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -387,7 +387,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
if( GRFILTER_OK != nErr )
{
String aFilter( rFilterName );
- BOOL bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
+ sal_Bool bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
( aFilter.EqualsIgnoreCaseAscii( "gif" ) ) ||
( nFlags & XOUTBMP_USE_GIF_IF_POSSIBLE ) ||
( ( nFlags & XOUTBMP_USE_GIF_IF_SENSIBLE ) && ( bAnimated || bTransparent ) );
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 3d377c88fa4d..642dbecaa876 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -108,7 +108,7 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH -XATTR_START] = new XFillBmpStretchItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX -XATTR_START] = new XFillBmpPosOffsetXItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY -XATTR_START] = new XFillBmpPosOffsetYItem;
- mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, FALSE );
+ mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False );
mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
mppLocalPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem;
mppLocalPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem;
@@ -178,12 +178,12 @@ XOutdevItemPool::XOutdevItemPool(
/*************************************************************************
|*
|* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|* (Parameter 2 = TRUE)
+|* (Parameter 2 = sal_True)
|*
\************************************************************************/
XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool)
-: SfxItemPool(rPool, TRUE),
+: SfxItemPool(rPool, sal_True),
mppLocalPoolDefaults(0L),
mpLocalItemInfos(0L)
{