summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-11 15:23:07 +0200
committerNoel Grandin <noel@peralex.com>2014-03-14 07:50:32 +0200
commit13bc4094dadb6accfbe00ba93dee178c22922c56 (patch)
treee22f2a6b63a84b95123b706aa1a75259126cb261
parentfae4102573d184696a1fe1394258ec9ad3a895dc (diff)
svx: sal_Bool->bool
Change-Id: I673d022c01b7d076120c026b236a37735b5043b0
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx2
-rw-r--r--cui/source/tabpages/tparea.cxx8
-rw-r--r--cui/source/tabpages/tpline.cxx8
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
-rw-r--r--include/svx/xbitmap.hxx8
-rw-r--r--include/svx/xbtmpit.hxx2
-rw-r--r--include/svx/xflbckit.hxx2
-rw-r--r--include/svx/xflbmsli.hxx2
-rw-r--r--include/svx/xflbmtit.hxx2
-rw-r--r--include/svx/xflbstit.hxx2
-rw-r--r--include/svx/xflftrit.hxx12
-rw-r--r--include/svx/xflgrit.hxx2
-rw-r--r--include/svx/xflhtit.hxx2
-rw-r--r--include/svx/xftmrit.hxx2
-rw-r--r--include/svx/xftouit.hxx2
-rw-r--r--include/svx/xit.hxx4
-rw-r--r--include/svx/xlndsit.hxx2
-rw-r--r--include/svx/xlnedcit.hxx2
-rw-r--r--include/svx/xlnstcit.hxx2
-rw-r--r--include/svx/xmleohlp.hxx18
-rw-r--r--include/svx/xmlgrhlp.hxx12
-rw-r--r--include/svx/xoutbmp.hxx4
-rw-r--r--include/svx/xpoly.hxx18
-rw-r--r--include/svx/xpool.hxx2
-rw-r--r--include/svx/xtextit0.hxx2
-rw-r--r--sc/source/core/tool/detfunc.cxx6
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx8
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx4
-rw-r--r--sd/source/ui/func/fucon3d.cxx4
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/unodraw/unottabl.cxx2
-rw-r--r--svx/source/xml/xmleohlp.cxx50
-rw-r--r--svx/source/xml/xmlgrhlp.cxx18
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx8
-rw-r--r--svx/source/xoutdev/_xpoly.cxx30
-rw-r--r--svx/source/xoutdev/xattr.cxx28
-rw-r--r--svx/source/xoutdev/xattr2.cxx8
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx6
-rw-r--r--svx/source/xoutdev/xpool.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx4
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
44 files changed, 161 insertions, 161 deletions
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 460d3dbaf5a1..65263e1fe37f 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -281,7 +281,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
if( (aValue >>= aName) &&
!aName.isEmpty())
{
- aItem.SetEnabled( sal_True );
+ aItem.SetEnabled( true );
rOutItemSet.Put( aItem );
}
}
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 354b7ab118d4..8fdda34f69c7 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -378,7 +378,7 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100);
XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aGrad);
- aItem.SetEnabled(sal_False);
+ aItem.SetEnabled(false);
rAttrs.Put(aItem);
bModified = sal_True;
}
@@ -1212,7 +1212,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pTsbScale->IsEnabled() )
pItem = new XFillBmpSizeLogItem( eState == TRISTATE_FALSE );
else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState() == TRISTATE_TRUE )
- pItem = new XFillBmpSizeLogItem( sal_True );
+ pItem = new XFillBmpSizeLogItem( true );
if( pItem )
{
@@ -2224,7 +2224,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
{
// original size -> size == 0
rXFSet.Put( XFillBmpSizeXItem( 0 ) );
- rXFSet.Put( XFillBmpSizeLogItem( sal_True ) );
+ rXFSet.Put( XFillBmpSizeLogItem( true ) );
}
if( m_pMtrFldYSize->IsEnabled() )
@@ -2245,7 +2245,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
{
// original size -> size == 0
rXFSet.Put( XFillBmpSizeYItem( 0 ) );
- rXFSet.Put( XFillBmpSizeLogItem( sal_True ) );
+ rXFSet.Put( XFillBmpSizeLogItem( true ) );
}
if( m_pMtrFldOffset->IsEnabled() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index b6529fe0e523..6bd4deddd722 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1063,14 +1063,14 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl()
// Centered line end
if( m_pTsbCenterStart->GetState() == TRISTATE_TRUE )
- rXLSet.Put( XLineStartCenterItem( sal_True ) );
+ rXLSet.Put( XLineStartCenterItem( true ) );
else if( m_pTsbCenterStart->GetState() == TRISTATE_FALSE )
- rXLSet.Put( XLineStartCenterItem( sal_False ) );
+ rXLSet.Put( XLineStartCenterItem( false ) );
if( m_pTsbCenterEnd->GetState() == TRISTATE_TRUE )
- rXLSet.Put( XLineEndCenterItem( sal_True ) );
+ rXLSet.Put( XLineEndCenterItem( true ) );
else if( m_pTsbCenterEnd->GetState() == TRISTATE_FALSE )
- rXLSet.Put( XLineEndCenterItem( sal_False ) );
+ rXLSet.Put( XLineEndCenterItem( false ) );
// Transparency
sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue();
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 016939675bfe..2ffcdccacbed 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4474,7 +4474,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
if ( nStartAngle != nEndAngle )
{
XPolygon aXPoly( aPolyBoundRect.Center(), aPolyBoundRect.GetWidth() / 2, aPolyBoundRect.GetHeight() / 2,
- (sal_uInt16)nStartAngle / 10, (sal_uInt16)nEndAngle / 10, sal_True );
+ (sal_uInt16)nStartAngle / 10, (sal_uInt16)nEndAngle / 10, true );
Rectangle aPolyPieRect( aXPoly.GetBoundRect() );
double fYScale = 0.0, fXScale = 0.0;
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 4ff5e77d0f6b..4229d62964a1 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -35,7 +35,7 @@ private:
Size aArraySize;
Color aPixelColor;
Color aBckgrColor;
- sal_Bool bGraphicDirty;
+ bool bGraphicDirty;
const GraphicObject& GetGraphicObject() const;
@@ -51,9 +51,9 @@ public:
void Array2Bitmap();
void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; }
- void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = sal_True; }
- void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = sal_True; }
- void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = sal_True; }
+ void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = true; }
+ void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = true; }
+ void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = true; }
XBitmapType GetBitmapType() const { return eType; }
Bitmap GetBitmap() const;
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index d2729dc772d3..4c612cda1ca2 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -66,7 +66,7 @@ public:
const GraphicObject& GetGraphicObject() const;
void SetGraphicObject(const GraphicObject& rGraphicObject);
- static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index cc84ce51a767..0ed1bfb6a0bf 100644
--- a/include/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
public:
TYPEINFO();
- XFillBackgroundItem( sal_Bool bFill = sal_False );
+ XFillBackgroundItem( bool bFill = false );
SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index 029bfe668dc1..11b4a15048b1 100644
--- a/include/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
@@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpSizeLogItem( sal_Bool bLog = sal_True );
+ XFillBmpSizeLogItem( bool bLog = true );
SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index 3667ffd56e47..a60458e73cb4 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpTileItem( sal_Bool bTile = sal_True );
+ XFillBmpTileItem( bool bTile = true );
XFillBmpTileItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index 111058cead48..e2cea6a3b4a4 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpStretchItem( sal_Bool bStretch = sal_True );
+ XFillBmpStretchItem( bool bStretch = true );
XFillBmpStretchItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 55c9a201a3e6..a5d74affe0ab 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -31,14 +31,14 @@ class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem
{
private:
- sal_Bool bEnabled;
+ bool bEnabled;
public:
TYPEINFO();
XFillFloatTransparenceItem();
- XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
- XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
+ XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true );
+ XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true );
XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
virtual bool operator==( const SfxPoolItem& rItem ) const;
@@ -50,10 +50,10 @@ public:
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const;
- sal_Bool IsEnabled() const { return bEnabled; }
- void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; }
+ bool IsEnabled() const { return bEnabled; }
+ void SetEnabled( bool bEnable ) { bEnabled = bEnable; }
- static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 34152b122310..110ce064f5a6 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -58,7 +58,7 @@ public:
const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue
void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
- static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 84be34942e7d..bcf6d659b9bb 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -58,7 +58,7 @@ public:
const XHatch& GetHatchValue() const; // GetValue -> GetHatchValue
void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
- static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx
index caf9e36e78b0..9f0f6d330eeb 100644
--- a/include/svx/xftmrit.hxx
+++ b/include/svx/xftmrit.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextMirrorItem(sal_Bool bMirror = sal_False);
+ XFormTextMirrorItem(bool bMirror = false);
XFormTextMirrorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx
index 596cab1f9ac7..18c94d649874 100644
--- a/include/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextOutlineItem(sal_Bool bOutline = sal_False);
+ XFormTextOutlineItem(bool bOutline = false);
XFormTextOutlineItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 337467971ad4..2a83d5d90f56 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -30,7 +30,7 @@
class SfxItemPool;
class NameOrIndex;
-typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
+typedef bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
// class NameOrIndex
@@ -61,7 +61,7 @@ public:
void SetName(const OUString& rName) { SetValue(rName); }
sal_Int32 GetIndex() const { return nPalIndex; }
void SetIndex(sal_Int32 nIndex) { nPalIndex = nIndex; }
- sal_Bool IsIndex() const { return (nPalIndex >= 0); }
+ bool IsIndex() const { return (nPalIndex >= 0); }
/** this static checks if the given NameOrIndex item has a unique name for its value.
The returned String is a unique name for an item with this value in both given pools.
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 21809d5ad9fe..f8b7a01a0547 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -60,7 +60,7 @@ public:
const XDash& GetDashValue() const;
void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue
- static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index 8ef4e4eaf3f5..8212865078bc 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
{
public:
TYPEINFO();
- XLineEndCenterItem(sal_Bool bEndCenter = sal_False);
+ XLineEndCenterItem(bool bEndCenter = false);
XLineEndCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index 0ac4b0917402..ea9ea4b09a8d 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
{
public:
TYPEINFO();
- XLineStartCenterItem(sal_Bool bStartCenter = sal_False);
+ XLineStartCenterItem(bool bStartCenter = false);
XLineStartCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 27951556a9a3..1891523060ae 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -74,18 +74,18 @@ private:
SvXMLEmbeddedObjectHelperMode meCreateMode;
SvXMLEmbeddedObjectHelper_Impl *mpStreamMap;
- SVX_DLLPRIVATE sal_Bool ImplGetStorageNames(
- const OUString& rURLStr,
- OUString& rContainerStorageName,
- OUString& rObjectStorageName,
- sal_Bool bInternalToExternal,
- sal_Bool *pGraphicRepl=0,
- sal_Bool *pOasisFormat=0 ) const;
+ SVX_DLLPRIVATE bool ImplGetStorageNames(
+ const OUString& rURLStr,
+ OUString& rContainerStorageName,
+ OUString& rObjectStorageName,
+ bool bInternalToExternal,
+ bool *pGraphicRepl=0,
+ bool *pOasisFormat=0 ) const;
SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XStorage > ImplGetContainerStorage(
const OUString& rStorageName );
- SVX_DLLPRIVATE sal_Bool ImplReadObject(
+ SVX_DLLPRIVATE bool ImplReadObject(
const OUString& rContainerStorageName,
OUString& rObjName,
const SvGlobalName *pClassId,
@@ -116,7 +116,7 @@ public:
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
::comphelper::IEmbeddedHelper& rDocPersist,
SvXMLEmbeddedObjectHelperMode eCreateMode,
- sal_Bool bDirect = sal_True );
+ bool bDirect = true );
static SvXMLEmbeddedObjectHelper* Create(
::comphelper::IEmbeddedHelper& rDocPersist,
SvXMLEmbeddedObjectHelperMode eCreateMode );
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 40a6932ca49f..bd5a2a79ca40 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -62,9 +62,9 @@ private:
GraphicOutputStreamVector maGrfStms;
URLSet maURLSet;
SvXMLGraphicHelperMode meCreateMode;
- sal_Bool mbDirect;
+ bool mbDirect;
- SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const OUString& rURLStr,
+ SVX_DLLPRIVATE bool ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStorageName,
OUString& rPictureStreamName );
SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage >
@@ -72,11 +72,11 @@ private:
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
ImplGetGraphicStream( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,
- sal_Bool bTruncate );
+ bool bTruncate );
SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const OUString& rFileName ) const;
SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName );
- SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const OUString& rPictureStorageName,
+ SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,
const OUString& rGraphicId,
bool bUseGfxLink );
@@ -87,7 +87,7 @@ protected:
~SvXMLGraphicHelper();
void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- sal_Bool bDirect );
+ bool bDirect );
virtual void SAL_CALL disposing();
@@ -96,7 +96,7 @@ public:
static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- sal_Bool bDirect = sal_True );
+ bool bDirect = true );
static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode );
static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper );
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 4a0539af0d51..0f802210ace2 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -50,7 +50,7 @@ public:
static GraphicFilter* pGrfFilter;
static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
- static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
+ static Animation MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr );
static sal_uInt16 WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
const OUString& rFilterName, const sal_uIntPtr nFlags = 0L,
const Size* pMtfSize_100TH_MM = NULL );
@@ -67,7 +67,7 @@ public:
const Rectangle* pWorkRect = NULL );
};
-SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap );
+SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap );
#endif // INCLUDED_SVX_XOUTBMP_HXX
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index a60e69c53536..a57fb8938622 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -56,11 +56,11 @@ protected:
void CheckReference();
// Hilfsfunktionen fuer Bezierkonvertierung
- void SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT);
+ void SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT);
void GenBezArc(const Point& rCenter, long nRx, long nRy,
long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
sal_uInt16 nQuad, sal_uInt16 nFirst);
- sal_Bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
+ bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
public:
XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
@@ -69,7 +69,7 @@ public:
XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 );
XPolygon( const Point& rCenter, long nRx, long nRy,
sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600,
- sal_Bool bClose = sal_True );
+ bool bClose = true );
~XPolygon();
@@ -87,13 +87,13 @@ public:
const Point& operator[]( sal_uInt16 nPos ) const;
Point& operator[]( sal_uInt16 nPos );
XPolygon& operator=( const XPolygon& rXPoly );
- sal_Bool operator==( const XPolygon& rXPoly ) const;
- sal_Bool operator!=( const XPolygon& rXPoly ) const;
+ bool operator==( const XPolygon& rXPoly ) const;
+ bool operator!=( const XPolygon& rXPoly ) const;
XPolyFlags GetFlags( sal_uInt16 nPos ) const;
void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags );
- sal_Bool IsControl(sal_uInt16 nPos) const;
- sal_Bool IsSmooth(sal_uInt16 nPos) const;
+ bool IsControl(sal_uInt16 nPos) const;
+ bool IsSmooth(sal_uInt16 nPos) const;
// Abstand zwischen zwei Punkten
double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2);
@@ -152,8 +152,8 @@ public:
XPolygon& operator[]( sal_uInt16 nPos );
XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly );
- sal_Bool operator==( const XPolyPolygon& rXPolyPoly ) const;
- sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const;
+ bool operator==( const XPolyPolygon& rXPolyPoly ) const;
+ bool operator!=( const XPolyPolygon& rXPolyPoly ) const;
// Transformationen
void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect);
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index a53dbbd49ed2..396578040c0a 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -41,7 +41,7 @@ public:
SfxItemPool* pMaster = 0L,
sal_uInt16 nAttrStart = XATTR_START,
sal_uInt16 nAttrEnd = XATTR_END,
- sal_Bool bLoadRefCounts = sal_True);
+ bool bLoadRefCounts = true);
XOutdevItemPool(const XOutdevItemPool& rPool);
virtual SfxItemPool* Clone() const;
diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 65d50c7215c0..80b75e52cf30 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -55,7 +55,7 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextHideFormItem(sal_Bool bHide = sal_False);
+ XFormTextHideFormItem(bool bHide = false);
XFormTextHideFormItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 0463972693ee..a06d9bc20555 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -165,21 +165,21 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
aArrowSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aCircle) ) );
aArrowSet.Put( XLineStartWidthItem( 200 ) );
- aArrowSet.Put( XLineStartCenterItem( sal_True ) );
+ aArrowSet.Put( XLineStartCenterItem( true ) );
aArrowSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
aArrowSet.Put( XLineEndWidthItem( 200 ) );
aArrowSet.Put( XLineEndCenterItem( false ) );
aToTabSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aCircle) ) );
aToTabSet.Put( XLineStartWidthItem( 200 ) );
- aToTabSet.Put( XLineStartCenterItem( sal_True ) );
+ aToTabSet.Put( XLineStartCenterItem( true ) );
aToTabSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aSquare) ) );
aToTabSet.Put( XLineEndWidthItem( 300 ) );
aToTabSet.Put( XLineEndCenterItem( false ) );
aFromTabSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aSquare) ) );
aFromTabSet.Put( XLineStartWidthItem( 300 ) );
- aFromTabSet.Put( XLineStartCenterItem( sal_True ) );
+ aFromTabSet.Put( XLineStartCenterItem( true ) );
aFromTabSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
aFromTabSet.Put( XLineEndWidthItem( 200 ) );
aFromTabSet.Put( XLineEndCenterItem( false ) );
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 8ebb9250a3b7..b576742aa4bf 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -273,7 +273,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XLineStartWidthItem(700));
pISet->Put(XLineEndWidthItem(300));
- pISet->Put(XLineStartCenterItem(sal_True));
+ pISet->Put(XLineStartCenterItem(true));
// Object with Shadow
aName = SD_RESSTR(STR_POOLSHEET_OBJWITHSHADOW);
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 29a208c46639..6c5c9197d395 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -554,12 +554,12 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{
pGraphicHelper = SvXMLGraphicHelper::Create( xStorage,
GRAPHICHELPER_MODE_READ,
- sal_False );
+ false );
xGraphicResolver = pGraphicHelper;
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStorage, *pDoc->GetPersist(),
EMBEDDEDOBJECTHELPER_MODE_READ,
- sal_False );
+ false );
xObjectResolver = pObjectHelper;
}
@@ -895,10 +895,10 @@ sal_Bool SdXMLFilter::Export()
// create helper for graphic and ole export if we have a storage
if( xStorage.is() )
{
- pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), EMBEDDEDOBJECTHELPER_MODE_WRITE, sal_False );
+ pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), EMBEDDEDOBJECTHELPER_MODE_WRITE, false );
xObjectResolver = pObjectHelper;
- pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, sal_False );
+ pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, false );
xGrfResolver = pGraphicHelper;
}
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 58bb10d8ee2d..1db7fa25fce2 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -390,7 +390,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
aStartArrow.setClosed(true);
mpPathObj->SetMergedItem(XLineStartItem(aEmpty,::basegfx::B2DPolyPolygon(aStartArrow)));
mpPathObj->SetMergedItem(XLineStartWidthItem(400));
- mpPathObj->SetMergedItem(XLineStartCenterItem(sal_True));
+ mpPathObj->SetMergedItem(XLineStartCenterItem(true));
updatePathAttributes();
@@ -438,7 +438,7 @@ void MotionPathTag::updatePathAttributes()
aEndArrow.setClosed(true);
mpPathObj->SetMergedItem(XLineEndItem(aEmpty,::basegfx::B2DPolyPolygon(aEndArrow)));
mpPathObj->SetMergedItem(XLineEndWidthItem(400));
- mpPathObj->SetMergedItem(XLineEndCenterItem(sal_True));
+ mpPathObj->SetMergedItem(XLineEndCenterItem(true));
}
else
{
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index d0510f53736f..de697f83778a 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -109,7 +109,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
case SID_3D_SHELL:
{
- XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False);
+ XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, false);
aXPoly.Scale(5.0, 5.0);
::basegfx::B2DPolygon aB2DPolygon(aXPoly.getB2DPolygon());
@@ -127,7 +127,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
case SID_3D_HALF_SPHERE:
{
- XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False);
+ XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, false);
aXPoly.Scale(5.0, 5.0);
aXPoly.Insert(0, Point (2400*5, 1250*5), XPOLY_NORMAL);
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index df99c0f70903..f12f3e1d55f1 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -299,8 +299,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
aMigrateSet.Put(XFillBitmapItem(OUString("background"), aGraphic));
mpDoc->MigrateItemSet( &aMigrateSet, pTempSet.get(), NULL );
- pTempSet->Put( XFillBmpStretchItem( sal_True ));
- pTempSet->Put( XFillBmpTileItem( sal_False ));
+ pTempSet->Put( XFillBmpStretchItem( true ));
+ pTempSet->Put( XFillBmpTileItem( false ));
}
}
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 266b33837d3e..811bd4ab2b0f 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -1298,7 +1298,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
}
SfxItemPool* pPool = 0;
- const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, sal_Bool(bGradient));
+ const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient);
GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
return( 0L );
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 537e6c472a23..4e9c2c087396 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -368,13 +368,13 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const
{
if (nCircRelWink>=0) {
XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
- sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False);
+ sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),false);
aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH);
if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd;
return aXP;
} else {
XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
- sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False);
+ sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),false);
sal_uInt16 nAnz=aXP.GetPointCount();
for (sal_uInt16 nNum=nAnz/2; nNum>0;) {
nNum--; // reverse XPoly's order of points
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 18538e84de22..202784fcb4c1 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -74,7 +74,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
{
XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem();
- pNewItem->SetEnabled( sal_True );
+ pNewItem->SetEnabled( true );
return pNewItem;
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 2eff25cd2a00..c5ac758f07ca 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -219,13 +219,13 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(const OUString& _aURLNoPar,
}
}
-sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
+bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
const OUString& rURLStr,
OUString& rContainerStorageName,
OUString& rObjectStorageName,
- sal_Bool bInternalToExternal,
- sal_Bool *pGraphicRepl,
- sal_Bool *pOasisFormat ) const
+ bool bInternalToExternal,
+ bool *pGraphicRepl,
+ bool *pOasisFormat ) const
{
// internal URL: vnd.sun.star.EmbeddedObject:<object-name>
// or: vnd.sun.star.EmbeddedObject:<path>/<object-name>
@@ -239,13 +239,13 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
// it is also possible to have additional arguments at the end of URL: <main URL>[?<name>=<value>[,<name>=<value>]*]
if( pGraphicRepl )
- *pGraphicRepl = sal_False;
+ *pGraphicRepl = false;
if( pOasisFormat )
- *pOasisFormat = sal_True; // the default value
+ *pOasisFormat = true; // the default value
if( rURLStr.isEmpty() )
- return sal_False;
+ return false;
// get rid of arguments
sal_Int32 nPos = rURLStr.indexOf( '?' );
@@ -264,7 +264,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
if ( aToken.equalsIgnoreAsciiCase( "oasis=false" ) )
{
if ( pOasisFormat )
- *pOasisFormat = sal_False;
+ *pOasisFormat = false;
break;
}
else
@@ -278,12 +278,12 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
{
nPos = aURLNoPar.indexOf( ':' );
if( -1 == nPos )
- return sal_False;
+ return false;
sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE );
bool bGrUrl = !bObjUrl &&
aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE );
if( !(bObjUrl || bGrUrl) )
- return sal_False;
+ return false;
sal_Int32 nPathStart = nPos + 1;
nPos = aURLNoPar.lastIndexOf( '/' );
@@ -298,7 +298,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
rObjectStorageName = aURLNoPar.copy( nPos+1 );
}
else
- return sal_False;
+ return false;
if( bGrUrl )
{
@@ -309,7 +309,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
: maReplacementGraphicsContainerStorageName60;
if( pGraphicRepl )
- *pGraphicRepl = sal_True;
+ *pGraphicRepl = true;
}
@@ -322,10 +322,10 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
if( -1 != rContainerStorageName.indexOf( '/' ) )
{
OSL_FAIL( "SvXMLEmbeddedObjectHelper: invalid path name" );
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage(
@@ -364,7 +364,7 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt
return mxContainerStorage;
}
-sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
+bool SvXMLEmbeddedObjectHelper::ImplReadObject(
const OUString& rContainerStorageName,
OUString& rObjName,
const SvGlobalName *pClassId,
@@ -376,7 +376,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
uno::Reference < embed::XStorage > xCntnrStor( ImplGetContainerStorage( rContainerStorageName ) );
if( !xCntnrStor.is() && !pTemp )
- return sal_False;
+ return false;
OUString aSrcObjName( rObjName );
comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer();
@@ -417,7 +417,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
}
catch ( uno::Exception& )
{
- return sal_False;
+ return false;
}
}
else
@@ -428,7 +428,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
}
catch ( uno::Exception& )
{
- return sal_False;
+ return false;
}
}
}
@@ -444,7 +444,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
// area.
rContainer.GetEmbeddedObject( aName );
- return sal_True;
+ return true;
}
OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL(
@@ -561,7 +561,7 @@ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
const uno::Reference < embed::XStorage >& rRootStorage,
::comphelper::IEmbeddedHelper& rDocPersist,
SvXMLEmbeddedObjectHelperMode eCreateMode,
- sal_Bool bDirect )
+ bool bDirect )
{
(void)bDirect;
@@ -644,14 +644,14 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
}
else
{
- sal_Bool bGraphicRepl = sal_False;
- sal_Bool bOasisFormat = sal_True;
+ bool bGraphicRepl = false;
+ bool bOasisFormat = true;
Reference < XInputStream > xStrm;
OUString aContainerStorageName, aObjectStorageName;
if( ImplGetStorageNames( rURLStr, aContainerStorageName,
aObjectStorageName,
- sal_True,
- &bGraphicRepl,
+ true,
+ &bGraphicRepl,
&bOasisFormat ) )
{
try
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr
OUString aContainerStorageName, aObjectStorageName;
if( !ImplGetStorageNames( rURLStr, aContainerStorageName,
aObjectStorageName,
- sal_True ) )
+ true ) )
return sal_False;
comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer();
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index d9b84e3cf4d4..24d47a79376c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -354,7 +354,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) :
::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver,
::com::sun::star::document::XBinaryStreamResolver >( maMutex )
{
- Init( NULL, eCreateMode, sal_False );
+ Init( NULL, eCreateMode, false );
}
SvXMLGraphicHelper::SvXMLGraphicHelper() :
@@ -371,7 +371,7 @@ void SAL_CALL SvXMLGraphicHelper::disposing()
{
}
-sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr,
+bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr,
OUString& rPictureStorageName,
OUString& rPictureStreamName )
{
@@ -433,7 +433,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co
SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,
- sal_Bool bTruncate )
+ bool bTruncate )
{
SvxGraphicHelperStream_Impl aRet;
aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName );
@@ -496,7 +496,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName
const OUString& rPictureStreamName )
{
Graphic aGraphic;
- SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
+ SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) );
if( aStream.xStream.is() )
{
SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
@@ -507,7 +507,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName
return aGraphic;
}
-sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName,
+bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName,
const OUString& rGraphicId,
bool bUseGfxLink )
@@ -517,7 +517,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageNa
if( aGrfObject.GetType() != GRAPHIC_NONE )
{
- SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
+ SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) );
if( aStream.xStream.is() )
{
Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
@@ -739,7 +739,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt
void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- sal_Bool bDirect )
+ bool bDirect )
{
mxRootStorage = rXMLStorage;
meCreateMode = eCreateMode;
@@ -748,7 +748,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto
SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- sal_Bool bDirect )
+ bool bDirect )
{
SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper;
@@ -763,7 +763,7 @@ SvXMLGraphicHelper* SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode eCreateMo
SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper;
pThis->acquire();
- pThis->Init( NULL, eCreateMode, sal_False );
+ pThis->Init( NULL, eCreateMode, false );
return pThis;
}
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index bdf732aa5b4a..edd9cc9d7467 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -39,7 +39,7 @@
GraphicFilter* XOutBitmap::pGrfFilter = NULL;
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr )
{
Animation aNewAnim( rAnimation );
@@ -607,14 +607,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
return aRetPoly;
};
-sal_Bool DitherBitmap( Bitmap& rBitmap )
+bool DitherBitmap( Bitmap& rBitmap )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
else
- bRet = sal_False;
+ bRet = false;
return bRet;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 6a9668508b1e..371d44dc12e0 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -274,7 +274,7 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
/// create a ellipse (curve) as Bézier polygon
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
- sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
+ sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, bool bClose)
{
pImpXPolygon = new ImpXPolygon(17);
@@ -470,17 +470,17 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
return *this;
}
-sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
+bool XPolygon::operator==( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return true;
return *rXPoly.pImpXPolygon == *pImpXPolygon;
}
-sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
+bool XPolygon::operator!=( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return false;
return *rXPoly.pImpXPolygon != *pImpXPolygon;
}
@@ -500,13 +500,13 @@ void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
}
/// short path to read the CONTROL flag directly (TODO: better explain what the sense behind this flag is!)
-sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
+bool XPolygon::IsControl(sal_uInt16 nPos) const
{
return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
}
/// short path to read the SMOOTH and SYMMTR flag directly (TODO: better explain what the sense behind these flags is!)
-sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
+bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -526,7 +526,7 @@ double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
return sqrt(fDx * fDx + fDy * fDy);
}
-void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT)
{
Point* pPoints = pImpXPolygon->pPointAry;
double fT2 = fT * fT;
@@ -610,14 +610,14 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
}
if ( nStart > 0 )
- SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
+ SubdivideBezier(nFirst, false, (double)nStart / 900);
if ( nEnd < 900 )
- SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
+ SubdivideBezier(nFirst, true, (double)(nEnd-nStart) / (900-nStart));
SetFlags(nFirst+1, XPOLY_CONTROL);
SetFlags(nFirst+2, XPOLY_CONTROL);
}
-sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
+bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
{
if ( nStart == 3600 ) nStart = 0;
if ( nEnd == 0 ) nEnd = 3600;
@@ -1049,15 +1049,15 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
return *this;
}
-sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return true;
return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
}
-sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return false;
return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f5f3c0dbad37..800542e81ec2 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1017,7 +1017,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
}
@@ -2115,7 +2115,7 @@ bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
-XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
{
}
@@ -2178,7 +2178,7 @@ bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal
TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
-XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
{
}
@@ -2907,7 +2907,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
return true;
}
-sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
}
@@ -2935,12 +2935,12 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
- bEnabled( sal_False )
+ bEnabled( false )
{
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -2954,7 +2954,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -2998,7 +2998,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPrese
return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
}
-sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -3022,7 +3022,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
{
- return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
+ return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), true );
}
}
}
@@ -3031,7 +3031,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// #85953# if disabled, force name to empty string
if( !GetName().isEmpty() )
{
- return new XFillFloatTransparenceItem(OUString(), GetGradientValue(), sal_False);
+ return new XFillFloatTransparenceItem(OUString(), GetGradientValue(), false);
}
}
@@ -3334,7 +3334,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
}
@@ -3499,7 +3499,7 @@ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
-XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
{
}
@@ -3523,7 +3523,7 @@ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
-XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
{
}
@@ -3665,7 +3665,7 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
-XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
{
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 7fabfdb9bfdd..0291ec402e0c 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -547,7 +547,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
-XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
{
}
@@ -746,7 +746,7 @@ bool XFillBmpSizeYItem::HasMetrics() const
TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
{
}
@@ -884,7 +884,7 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
-XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
{
}
@@ -1022,7 +1022,7 @@ SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation
TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
-XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
{
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 674f8f63727a..71dbdba847df 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -46,7 +46,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp ) :
eType ( XBITMAP_IMPORT ),
aGraphicObject ( rBmp ),
pPixelArray ( NULL ),
- bGraphicDirty ( sal_False )
+ bGraphicDirty ( false )
{
}
@@ -194,7 +194,7 @@ void XOBitmap::Array2Bitmap()
}
aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
- bGraphicDirty = sal_False;
+ bGraphicDirty = false;
}
// class XFillBitmapItem
@@ -538,7 +538,7 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt
return (bSetName || bSetURL || bSetBitmap);
}
-sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
const GraphicObject& aGraphicObjectA(((XFillBitmapItem*)p1)->GetGraphicObject());
const GraphicObject& aGraphicObjectB(((XFillBitmapItem*)p2)->GetGraphicObject());
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 2630e8b80cf0..765cb8074c1f 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -28,7 +28,7 @@ XOutdevItemPool::XOutdevItemPool(
SfxItemPool* _pMaster,
sal_uInt16 nAttrStart,
sal_uInt16 nAttrEnd,
- sal_Bool bLoadRefCounts)
+ bool bLoadRefCounts)
: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
{
// prepare some defaults
@@ -92,7 +92,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, sal_False );
+ mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, false );
mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
mppLocalPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem;
mppLocalPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index cd88b8f95af6..2fb7a034a059 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -507,7 +507,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
pGraphicHelper = SvXMLGraphicHelper::Create( xStorage,
GRAPHICHELPER_MODE_READ,
- sal_False );
+ false );
xGraphicResolver = pGraphicHelper;
SfxObjectShell *pPersist = rDoc.GetPersist();
if( pPersist )
@@ -515,7 +515,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStorage, *pPersist,
EMBEDDEDOBJECTHELPER_MODE_READ,
- sal_False );
+ false );
xObjectResolver = pObjectHelper;
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 64876fa4e820..f2570a0bbefb 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -82,9 +82,9 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
SvXMLEmbeddedObjectHelper *pObjectHelper = 0;
OSL_ENSURE( xStg.is(), "Where is my storage?" );
-pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
+ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
GRAPHICHELPER_MODE_WRITE,
- sal_False );
+ false );
xGraphicResolver = pGraphicHelper;
SfxObjectShell *pPersist = pDoc->GetPersist();
@@ -93,7 +93,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
pObjectHelper = SvXMLEmbeddedObjectHelper::Create(
xStg, *pPersist,
EMBEDDEDOBJECTHELPER_MODE_WRITE,
- sal_False );
+ false );
xObjectResolver = pObjectHelper;
}