summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-20 16:07:35 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:10 +0200
commitf7074d8de59f58367b31d7266037880403ac27ef (patch)
treebe3892c58184f01b9ac690cac5cc016eabc21f4e
parent7a679ee19c3a18d89277c28b12bf81911acfef85 (diff)
svtools: sal_Bool->bool
Change-Id: I2044e6c1f15579b6051fad5d36fcfa8795f88953
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx2
-rw-r--r--fpicker/source/office/iodlgimp.cxx6
-rw-r--r--include/svtools/imagemgr.hxx40
-rw-r--r--include/svtools/imap.hxx6
-rw-r--r--include/svtools/imapcirc.hxx16
-rw-r--r--include/svtools/imapobj.hxx20
-rw-r--r--include/svtools/imappoly.hxx18
-rw-r--r--include/svtools/imaprect.hxx14
-rw-r--r--include/svtools/inetimg.hxx4
-rw-r--r--include/svtools/inettbc.hxx28
-rw-r--r--include/svtools/insdlg.hxx2
-rw-r--r--include/svtools/ivctrl.hxx48
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/menu/mnuitem.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx8
-rw-r--r--svtools/source/contnr/imivctl1.cxx10
-rw-r--r--svtools/source/contnr/ivctrl.cxx52
-rw-r--r--svtools/source/contnr/templwin.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx118
-rw-r--r--svtools/source/dialogs/insdlg.cxx6
-rw-r--r--svtools/source/misc/imagemgr.cxx262
-rw-r--r--svtools/source/misc/imap.cxx86
-rw-r--r--svtools/source/uno/unoimap.cxx14
-rw-r--r--svtools/source/urlobj/inetimg.cxx8
-rw-r--r--svx/source/dialog/imapwnd.cxx20
26 files changed, 398 insertions, 398 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 447fefbccbdc..8c901d4289b7 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -222,7 +222,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
SetCtrlPos ( meChoicePos );
maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
maIconCtrl.Show();
- maIconCtrl.SetChoiceWithCursor ( sal_True );
+ maIconCtrl.SetChoiceWithCursor ( true );
maIconCtrl.SetSelectionMode( SINGLE_SELECTION );
maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL );
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index ad6f505bd694..62afddd51d2a 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -56,7 +56,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
- SetChoiceWithCursor( sal_True );
+ SetChoiceWithCursor( true );
SetSelectionMode(SINGLE_SELECTION);
}
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 2bc796aa9f65..2ff7d55713eb 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -154,9 +154,9 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
INetURLObject aObject( pBox->GetViewURL() );
sal_Int32 nCount = aObject.getSegmentCount();
- ::svtools::VolumeInfo aVolInfo( sal_True /* volume */, sal_False /* remote */,
- sal_False /* removable */, sal_False /* floppy */,
- sal_False /* compact disk */ );
+ ::svtools::VolumeInfo aVolInfo( true /* volume */, false /* remote */,
+ false /* removable */, false /* floppy */,
+ false /* compact disk */ );
Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo ) );
while ( nCount >= 1 )
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 59735a037411..2df64635f8dc 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -33,24 +33,24 @@ namespace svtools {
struct VolumeInfo
{
- sal_Bool m_bIsVolume;
- sal_Bool m_bIsRemote;
- sal_Bool m_bIsRemoveable;
- sal_Bool m_bIsFloppy;
- sal_Bool m_bIsCompactDisc;
+ bool m_bIsVolume;
+ bool m_bIsRemote;
+ bool m_bIsRemoveable;
+ bool m_bIsFloppy;
+ bool m_bIsCompactDisc;
VolumeInfo() :
- m_bIsVolume ( sal_False ),
- m_bIsRemote ( sal_False ),
- m_bIsRemoveable ( sal_False ),
- m_bIsFloppy ( sal_False ),
- m_bIsCompactDisc( sal_False ) {}
+ m_bIsVolume ( false ),
+ m_bIsRemote ( false ),
+ m_bIsRemoveable ( false ),
+ m_bIsFloppy ( false ),
+ m_bIsCompactDisc( false ) {}
- VolumeInfo( sal_Bool _bIsVolume,
- sal_Bool _bIsRemote,
- sal_Bool _bIsRemoveable,
- sal_Bool _bIsFloppy,
- sal_Bool _bIsCompactDisc ) :
+ VolumeInfo( bool _bIsVolume,
+ bool _bIsRemote,
+ bool _bIsRemoveable,
+ bool _bIsFloppy,
+ bool _bIsCompactDisc ) :
m_bIsVolume ( _bIsVolume ),
m_bIsRemote ( _bIsRemote ),
m_bIsRemoveable ( _bIsRemoveable ),
@@ -63,13 +63,13 @@ struct VolumeInfo
class SvFileInformationManager
{
private:
- SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
+ SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder );
public:
- SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
+ SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, bool bBig = false );
SVT_DLLPUBLIC static rtl::OUString GetDescription( const INetURLObject& rObject );
SVT_DLLPUBLIC static rtl::OUString GetFileDescription( const INetURLObject& rObject );
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index f421b2fce82d..951251d11bf0 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -79,8 +79,8 @@ public:
ImageMap& operator=( const ImageMap& rImageMap );
// Vergleichsoperator (es wird alles auf Gleichheit geprueft)
- sal_Bool operator==( const ImageMap& rImageMap );
- sal_Bool operator!=( const ImageMap& rImageMap );
+ bool operator==( const ImageMap& rImageMap );
+ bool operator!=( const ImageMap& rImageMap );
// In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt
void InsertIMapObject( const IMapObject& rIMapObject );
@@ -137,7 +137,7 @@ class IMapCompat
IMapCompat() {}
IMapCompat( const IMapCompat& ) {}
IMapCompat& operator=( const IMapCompat& ) { return *this; }
- sal_Bool operator==( const IMapCompat& ) { return sal_False; }
+ bool operator==( const IMapCompat& ) { return false; }
public:
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index ef3926848093..1750dc7638a0 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -30,7 +30,7 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
Point aCenter;
sal_Int32 nRadius;
- void ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel );
+ void ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel );
protected:
@@ -47,15 +47,15 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapCircleObject() {};
- virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual sal_uInt16 GetType() const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Point GetCenter( sal_Bool bPixelCoords = sal_True ) const;
- sal_uLong GetRadius( sal_Bool bPixelCoords = sal_True ) const;
+ Point GetCenter( bool bPixelCoords = true ) const;
+ sal_uLong GetRadius( bool bPixelCoords = true ) const;
// liefert das BoundRect des Kreis-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const;
@@ -63,7 +63,7 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapCircleObject& rEqObj );
+ bool IsEqual( const IMapCircleObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index f04cbb74781f..9c0f73b91450 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -59,7 +59,7 @@ class SVT_DLLPUBLIC IMapObject
OUString aTarget;
OUString aName;
SvxMacroTableDtor aEventList;
- sal_Bool bActive;
+ bool bActive;
protected:
sal_uInt16 nReadVersion;
@@ -84,12 +84,12 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive );
+ bool bActive );
virtual ~IMapObject() {};
virtual sal_uInt16 GetVersion() const;
virtual sal_uInt16 GetType() const = 0;
- virtual sal_Bool IsHit( const Point& rPoint ) const = 0;
+ virtual bool IsHit( const Point& rPoint ) const = 0;
void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
void Read( SvStream& rIStm, const OUString& rBaseURL );
@@ -111,22 +111,22 @@ public:
const OUString& GetName() const { return aName; }
void SetName( const OUString& rName ) { aName = rName; }
- sal_Bool IsActive() const { return bActive; }
- void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
+ bool IsActive() const { return bActive; }
+ void SetActive( bool bSetActive = true ) { bActive = bSetActive; }
- sal_Bool IsEqual( const IMapObject& rEqObj );
+ bool IsEqual( const IMapObject& rEqObj );
// IMap-Events
inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;}
inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; }
inline const SvxMacro& GetEvent( sal_uInt16 nEvent ) const;
- inline sal_Bool HasEvent( sal_uInt16 nEvent ) const;
+ inline bool HasEvent( sal_uInt16 nEvent ) const;
void SetEvent( sal_uInt16 nEvent, const SvxMacro& );
- inline sal_Bool DelEvent( sal_uInt16 nEvent );
+ inline bool DelEvent( sal_uInt16 nEvent );
};
-inline sal_Bool IMapObject::HasEvent( sal_uInt16 nEvent ) const
+inline bool IMapObject::HasEvent( sal_uInt16 nEvent ) const
{
return aEventList.IsKeyValid( nEvent );
}
@@ -134,7 +134,7 @@ inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const
{
return *(aEventList.Get( nEvent ));
}
-inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent )
+inline bool IMapObject::DelEvent( sal_uInt16 nEvent )
{
return aEventList.Erase( nEvent );
}
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index 24f8a14b510c..5c7615e1c41e 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -30,9 +30,9 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
{
Polygon aPoly;
Rectangle aEllipse;
- sal_Bool bEllipse;
+ bool bEllipse;
- SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, sal_Bool bPixel );
+ SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, bool bPixel );
protected:
@@ -40,7 +40,7 @@ protected:
virtual void WriteIMapObject( SvStream& rOStm ) const;
virtual void ReadIMapObject( SvStream& rIStm );
- sal_Bool ReadPreProLine( SvStream& rIStm, OUString& rStr );
+ bool ReadPreProLine( SvStream& rIStm, OUString& rStr );
public:
IMapPolygonObject() {};
@@ -50,26 +50,26 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapPolygonObject() {};
virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Polygon GetPolygon( sal_Bool bPixelCoords = sal_True ) const;
+ Polygon GetPolygon( bool bPixelCoords = true ) const;
// liefert das BoundRect des Polygon-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); }
- sal_Bool HasExtraEllipse() const { return bEllipse; }
+ bool HasExtraEllipse() const { return bEllipse; }
const Rectangle& GetExtraEllipse() const { return aEllipse; }
void SetExtraEllipse( const Rectangle& rEllipse );
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapPolygonObject& rEqObj );
+ bool IsEqual( const IMapPolygonObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index 35cf320b03a0..72106265577b 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -29,7 +29,7 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
{
Rectangle aRect;
- SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, sal_Bool bPixel );
+ SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, bool bPixel );
protected:
@@ -46,14 +46,14 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapRectangleObject() {};
- virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual sal_uInt16 GetType() const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Rectangle GetRectangle( sal_Bool bPixelCoords = sal_True ) const;
+ Rectangle GetRectangle( bool bPixelCoords = true ) const;
// liefert das BoundRect des Rechteck-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const { return aRect; }
@@ -61,7 +61,7 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapRectangleObject& rEqObj );
+ bool IsEqual( const IMapRectangleObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f9b86f16f9d2..1f5274e8050f 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -67,8 +67,8 @@ public:
const Size& GetSizePixel() const { return aSizePixel; }
// Im-/Export
- sal_Bool Write( SvStream& rOStm, sal_uLong nFormat ) const;
- sal_Bool Read( SvStream& rIStm, sal_uLong nFormat );
+ bool Write( SvStream& rOStm, sal_uLong nFormat ) const;
+ bool Read( SvStream& rIStm, sal_uLong nFormat );
};
#endif // INCLUDED_SVTOOLS_INETIMG_HXX
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 0ee7b1064edc..0d14ba13d913 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -38,17 +38,17 @@ friend class SvtURLBox_Impl;
rtl::Reference< SvtMatchContext_Impl > pCtx;
SvtURLBox_Impl* pImp;
INetProtocol eSmartProtocol;
- sal_Bool bAutoCompleteMode : 1;
- sal_Bool bOnlyDirectories : 1;
- sal_Bool bCtrlClick : 1;
- sal_Bool bHistoryDisabled : 1;
- sal_Bool bNoSelection : 1;
- sal_Bool bIsAutoCompleteEnabled : 1;
+ bool bAutoCompleteMode : 1;
+ bool bOnlyDirectories : 1;
+ bool bCtrlClick : 1;
+ bool bHistoryDisabled : 1;
+ bool bNoSelection : 1;
+ bool bIsAutoCompleteEnabled : 1;
- SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode& rCode );
- SVT_DLLPRIVATE void TryAutoComplete();
- SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
- DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
+ SVT_DLLPRIVATE bool ProcessKey( const KeyCode& rCode );
+ SVT_DLLPRIVATE void TryAutoComplete();
+ SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
+ DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
protected:
@@ -67,11 +67,11 @@ public:
const OUString& GetBaseURL() const { return aBaseURL; }
void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
const Link& GetOpenHdl() const { return aOpenHdl; }
- void SetOnlyDirectories( sal_Bool bDir = sal_True );
- void SetNoURLSelection( sal_Bool bSet = sal_True );
+ void SetOnlyDirectories( bool bDir = true );
+ void SetNoURLSelection( bool bSet = true );
INetProtocol GetSmartProtocol() const { return eSmartProtocol; }
void SetSmartProtocol( INetProtocol eProt );
- sal_Bool IsCtrlOpen()
+ bool IsCtrlOpen()
{ return bCtrlClick; }
OUString GetURL();
void DisableHistory();
@@ -82,7 +82,7 @@ public:
void SetFilter(const OUString& _sFilter);
- inline void EnableAutocompletion( sal_Bool _bEnable = sal_True )
+ inline void EnableAutocompletion( bool _bEnable = true )
{ bIsAutoCompleteEnabled = _bEnable; }
void SetPlaceHolder( const OUString& sPlaceHolder )
{ aPlaceHolder = sPlaceHolder; }
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 763b4ef4c44b..7bdfe48c1b68 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -71,7 +71,7 @@ class SVT_DLLPUBLIC SvPasteObjectHelper
{
public:
static OUString GetSotFormatUIName( SotFormatStringId nId );
- static sal_Bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat);
+ static bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat);
};
#endif // INCLUDED_SVTOOLS_INSDLG_HXX
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index e2b2c9717471..82ee15894e68 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -125,18 +125,18 @@ public:
const Rectangle & GetBoundRect() const { return aRect; }
- void SetFocus ( sal_Bool bSet )
+ void SetFocus ( bool bSet )
{ nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); }
- SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; }
- sal_uInt16 GetFlags() const { return nFlags; }
- sal_Bool IsSelected() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
- sal_Bool IsFocused() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
- sal_Bool IsInUse() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
- sal_Bool IsCursored() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
- sal_Bool IsDropTarget() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
- sal_Bool IsBlockingEmphasis() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
- sal_Bool IsPosLocked() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
+ SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; }
+ sal_uInt16 GetFlags() const { return nFlags; }
+ bool IsSelected() const { return ((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
+ bool IsFocused() const { return ((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
+ bool IsInUse() const { return ((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
+ bool IsCursored() const { return ((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
+ bool IsDropTarget() const { return ((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
+ bool IsBlockingEmphasis() const { return ((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
+ bool IsPosLocked() const { return ((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
// Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead
SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; }
@@ -225,15 +225,15 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
Link _aVisRectChangedHdl;
KeyEvent* _pCurKeyEvent;
SvxIconChoiceCtrl_Impl* _pImp;
- sal_Bool _bAutoFontColor;
+ bool _bAutoFontColor;
protected:
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, sal_Bool bCancelled );
+ virtual bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled );
virtual void DocumentRectChanged();
virtual void VisibleRectChanged();
- virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
+ virtual bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
virtual void Command( const CommandEvent& rCEvt );
virtual void Paint( const Rectangle& rRect );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -253,7 +253,7 @@ protected:
OUString GetEntryText(
SvxIconChoiceCtrlEntry* pEntry,
- sal_Bool bInplaceEdit );
+ bool bInplaceEdit );
virtual void FillLayoutData() const;
@@ -267,7 +267,7 @@ public:
void SetStyle( WinBits nWinStyle );
WinBits GetStyle() const;
- sal_Bool SetChoiceWithCursor ( sal_Bool bDo = sal_True );
+ bool SetChoiceWithCursor ( bool bDo = true );
void SetFont( const Font& rFont );
void SetPointFont( const Font& rFont );
@@ -301,9 +301,9 @@ public:
*/
void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
- sal_Bool DoKeyInput( const KeyEvent& rKEvt );
+ bool DoKeyInput( const KeyEvent& rKEvt );
- sal_Bool IsEntryEditing() const;
+ bool IsEntryEditing() const;
sal_uLong GetEntryCount() const;
SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const;
@@ -317,7 +317,7 @@ public:
// bHit==sal_False: Eintrag gilt als getroffen, wenn Position im BoundRect liegt
// ==sal_True : Bitmap oder Text muss getroffen sein
- SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, sal_Bool bHit = sal_False ) const;
+ SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, bool bHit = false ) const;
// in dem sal_uLong wird die Position in der Liste des gefunden Eintrags zurueckgegeben
SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uLong& rPos ) const;
@@ -326,13 +326,13 @@ public:
void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
#endif
- virtual sal_Bool HasBackground() const;
- virtual sal_Bool HasFont() const;
- virtual sal_Bool HasFontTextColor() const;
- virtual sal_Bool HasFontFillColor() const;
+ virtual bool HasBackground() const;
+ virtual bool HasFont() const;
+ virtual bool HasFontTextColor() const;
+ virtual bool HasFontFillColor() const;
- void SetFontColorToBackground ( sal_Bool bDo = sal_True ) { _bAutoFontColor = bDo; }
- sal_Bool AutoFontColor () { return _bAutoFontColor; }
+ void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; }
+ bool AutoFontColor () { return _bAutoFontColor; }
Point GetPixelPos( const Point& rPosLogic ) const;
void SetSelectionMode( SelectionMode eMode );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4c1b0550d4b3..1ac853370f53 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1056,7 +1056,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
aURL.SetSmartProtocol( INET_PROT_FILE );
aURL.SetSmartURL( aFactory);
const OUString& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
- Image aImage = SvFileInformationManager::GetImage( aURL, sal_True );
+ Image aImage = SvFileInformationManager::GetImage( aURL, true );
if ( GetDPIScaleFactor() > 1)
{
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index b40e8924d40a..b27663ea4f44 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -372,7 +372,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
if ( !bImageSet && !aCmd.isEmpty() )
{
Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), sal_False );
+ INetURLObject(aCmd), false );
if ( !!aImage )
pActMenu->SetItemImage( nItemId, aImage );
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 4986350c8a61..a3d15babaadf 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2151,10 +2151,10 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
::svtools::VolumeInfo aVolInfo( (*aIt)->mbIsVolume, (*aIt)->mbIsRemote,
(*aIt)->mbIsRemoveable, (*aIt)->mbIsFloppy,
(*aIt)->mbIsCompactDisc );
- (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+ (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
}
else
- (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), sal_False );
+ (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), false );
}
}
@@ -2240,7 +2240,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
if( aValue != SEPARATOR_STR )
{
INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL );
- pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
+ pEntry->maImage = SvFileInformationManager::GetImage( aObj, false );
}
maContent.push_back( pEntry );
}
@@ -2448,7 +2448,7 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString&
::svtools::VolumeInfo aVolInfo;
pData->maType = SvFileInformationManager::GetFolderDescription( aVolInfo );
- pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+ pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
OUString aValue;
OUString aTab( "\t" );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 690e9e42eff9..87c8c2461db1 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -386,7 +386,7 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, sal_Bo
nFlags &= ~F_CLEARING_SELECTION;
}
}
- if( pEntry->IsSelected() != bSelect )
+ if( (pEntry->IsSelected() ? 1 : 0) != bSelect )
{
pHdlEntry = pEntry;
sal_uInt16 nEntryFlags = pEntry->GetFlags();
@@ -1672,7 +1672,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
{
OUString aText;
if( !pStr )
- aText = pView->GetEntryText( pEntry, sal_False );
+ aText = pView->GetEntryText( pEntry, false );
else
aText = *pStr;
@@ -1788,7 +1788,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
}
*/
- OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, false ) );
Rectangle aTextRect( CalcTextRect(pEntry,&rPos,sal_False,&aEntryText));
Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
@@ -3197,7 +3197,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
SetNoSelection();
pCurEditedEntry = pEntry;
- OUString aEntryText( pView->GetEntryText( pEntry, sal_True ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, true ) );
Rectangle aRect( CalcTextRect( pEntry, 0, sal_True, &aEntryText ) );
MakeVisible( aRect );
Point aPos( aRect.TopLeft() );
@@ -3672,7 +3672,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
return sal_False;
OUString sQuickHelpText = pEntry->GetQuickHelpText();
- OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, false ) );
Rectangle aTextRect( CalcTextRect( pEntry, 0, sal_False, &aEntryText ) );
if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
return sal_False;
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index e7992a587c59..0035f80225ba 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -77,7 +77,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
_pCurKeyEvent ( NULL ),
_pImp ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
- _bAutoFontColor ( sal_False )
+ _bAutoFontColor ( false )
{
SetLineColor();
@@ -101,14 +101,14 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, c
return pEntry;
}
-sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, sal_Bool )
+bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, bool )
{
- return sal_True;
+ return true;
}
-sal_Bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
+bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
{
- return sal_True;
+ return true;
}
void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
@@ -116,29 +116,29 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
rDev.DrawImage( rPos, pEntry->GetImage() );
}
-OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
{
return pEntry->GetText();
}
-sal_Bool SvtIconChoiceCtrl::HasBackground() const
+bool SvtIconChoiceCtrl::HasBackground() const
{
- return sal_False;
+ return false;
}
-sal_Bool SvtIconChoiceCtrl::HasFont() const
+bool SvtIconChoiceCtrl::HasFont() const
{
- return sal_False;
+ return false;
}
-sal_Bool SvtIconChoiceCtrl::HasFontTextColor() const
+bool SvtIconChoiceCtrl::HasFontTextColor() const
{
- return sal_True;
+ return true;
}
-sal_Bool SvtIconChoiceCtrl::HasFontFillColor() const
+bool SvtIconChoiceCtrl::HasFontFillColor() const
{
- return sal_True;
+ return true;
}
void SvtIconChoiceCtrl::Paint( const Rectangle& rRect )
@@ -178,7 +178,7 @@ void SvtIconChoiceCtrl::ArrangeIcons()
aFullSize.setWidth ( aFullSize.getWidth()+aEntryRect.GetWidth() );
}
- _pImp->Arrange ( sal_False, aFullSize.getWidth() );
+ _pImp->Arrange ( false, aFullSize.getWidth() );
}
else if ( GetStyle() & WB_ALIGN_LEFT )
{
@@ -193,13 +193,13 @@ void SvtIconChoiceCtrl::ArrangeIcons()
aFullSize.setHeight ( aFullSize.getHeight()+aEntryRect.GetHeight() );
}
- _pImp->Arrange ( sal_False, 0, aFullSize.getHeight() );
+ _pImp->Arrange ( false, 0, aFullSize.getHeight() );
}
else
{
_pImp->Arrange();
}
- _pImp->Arrange( sal_False, 0, 1000 );
+ _pImp->Arrange( false, 0, 1000 );
}
void SvtIconChoiceCtrl::Resize()
{
@@ -257,7 +257,7 @@ void SvtIconChoiceCtrl::SetPointFont( const Font& rFont )
_pImp->FontModified();
}
}
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, sal_Bool bHit ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, bool bHit ) const
{
Point aPos( rPixPos );
aPos -= GetMapMode().GetOrigin();
@@ -316,19 +316,19 @@ void SvtIconChoiceCtrl::ClickIcon()
GetSelectedEntry ( nPos );
_aClickIconHdl.Call( this );
}
-sal_Bool SvtIconChoiceCtrl::IsEntryEditing() const
+bool SvtIconChoiceCtrl::IsEntryEditing() const
{
return _pImp->IsEntryEditing();
}
-sal_Bool SvtIconChoiceCtrl::SetChoiceWithCursor ( sal_Bool bDo )
+bool SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo )
{
return _pImp->SetChoiceWithCursor (bDo);
}
void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
{
- sal_Bool bKeyUsed = DoKeyInput( rKEvt );
+ bool bKeyUsed = DoKeyInput( rKEvt );
if ( !bKeyUsed )
{
_pCurKeyEvent = (KeyEvent*)&rKEvt;
@@ -336,13 +336,13 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
_pCurKeyEvent = NULL;
}
}
-sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
+bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
{
// under OS/2, we get key up/down even while editing
if( IsEntryEditing() )
- return sal_True;
+ return true;
_pCurKeyEvent = (KeyEvent*)&rKEvt;
- sal_Bool bHandled = _pImp->KeyInput( rKEvt );
+ bool bHandled = _pImp->KeyInput( rKEvt );
_pCurKeyEvent = NULL;
return bHandled;
}
@@ -463,9 +463,9 @@ void SvtIconChoiceCtrl::FillLayoutData() const
Point aPos = _pImp->GetEntryBoundRect( pEntry ).TopLeft();
OUString sEntryText = pEntry->GetDisplayText( );
- Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, sal_False, &sEntryText );
+ Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, false, &sEntryText );
- sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
+ bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
_pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 5032b0c5a09a..39d6a828aff7 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -167,7 +167,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
aIconCtrl.SetAccessibleName( OUString( "Groups" ) );
aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL );
- aIconCtrl.SetChoiceWithCursor( sal_True );
+ aIconCtrl.SetChoiceWithCursor( true );
aIconCtrl.SetSelectionMode( SINGLE_SELECTION );
aIconCtrl.Show();
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5a2e8b822b73..34d55e1a7127 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -81,7 +81,7 @@ public:
std::vector<OUString> aCompletions;
std::vector<WildCard> m_aFilters;
- static sal_Bool TildeParsing( OUString& aText, OUString& aBaseUrl );
+ static bool TildeParsing( OUString& aText, OUString& aBaseUrl );
inline SvtURLBox_Impl( )
{
@@ -100,8 +100,8 @@ class SvtMatchContext_Impl: public salhelper::Thread
OUString aBaseURL;
OUString aText;
SvtURLBox* pBox;
- sal_Bool bOnlyDirectories;
- sal_Bool bNoSelection;
+ bool bOnlyDirectories;
+ bool bNoSelection;
osl::Mutex mutex_;
bool stopped_;
@@ -113,8 +113,8 @@ class SvtMatchContext_Impl: public salhelper::Thread
virtual ~SvtMatchContext_Impl();
virtual void execute();
void doExecute();
- void Insert( const OUString& rCompletion, const OUString& rURL, sal_Bool bForce = sal_False);
- void ReadFolder( const OUString& rURL, const OUString& rMatch, sal_Bool bSmart );
+ void Insert( const OUString& rCompletion, const OUString& rURL, bool bForce = false);
+ void ReadFolder( const OUString& rURL, const OUString& rMatch, bool bSmart );
void FillPicklist(std::vector<OUString>& rPickList);
public:
@@ -221,7 +221,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
}
SvtURLBox* pBox = pThis->pBox;
- pBox->bAutoCompleteMode = sal_True;
+ pBox->bAutoCompleteMode = true;
// did we filter completions which otherwise would have been valid?
// (to be filled below)
@@ -288,7 +288,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
const OUString& rURL,
- sal_Bool bForce )
+ bool bForce )
{
if( !bForce )
{
@@ -304,18 +304,18 @@ void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
const OUString& rMatch,
- sal_Bool bSmart )
+ bool bSmart )
{
// check folder to scan
if( !UCBContentHelper::IsFolder( rURL ) )
return;
- sal_Bool bPureHomePath = sal_False;
+ bool bPureHomePath = false;
#ifdef UNX
bPureHomePath = aText.startsWith( "~" ) && aText.indexOf( '/' ) == -1;
#endif
- sal_Bool bExectMatch = bPureHomePath
+ bool bExectMatch = bPureHomePath
|| aText == "."
|| aText.endsWith("/.")
|| aText.endsWith("/..");
@@ -329,7 +329,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
OUString aNewText( aText );
aNewText += "/";
- Insert( aNewText, rURL, sal_True );
+ Insert( aNewText, rURL, true );
return;
}
@@ -383,9 +383,9 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
Sequence< NumberedSortingInfo > aSortInfo( 2 );
NumberedSortingInfo* pInfo = aSortInfo.getArray();
pInfo[ 0 ].ColumnIndex = 2;
- pInfo[ 0 ].Ascending = sal_False;
+ pInfo[ 0 ].Ascending = false;
pInfo[ 1 ].ColumnIndex = 1;
- pInfo[ 1 ].Ascending = sal_True;
+ pInfo[ 1 ].Ascending = true;
uno::Reference< XDynamicResultSet > xDynamicResultSet;
xDynamicResultSet =
@@ -409,7 +409,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
{
OUString aURL = xContentAccess->queryContentIdentifierString();
OUString aTitle = xRow->getString(1);
- sal_Bool bIsFolder = xRow->getBoolean(2);
+ bool bIsFolder = xRow->getBoolean(2);
// matching is always done case insensitive, but completion will be case sensitive and case preserving
aTitle = aTitle.toAsciiLowerCase();
@@ -454,7 +454,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
if ( bIsFolder )
aInput += OUString(aDelimiter);
- Insert( aInput, aObj.GetMainURL( INetURLObject::NO_DECODE ), sal_True );
+ Insert( aInput, aObj.GetMainURL( INetURLObject::NO_DECODE ), true );
}
}
}
@@ -704,7 +704,7 @@ void SvtMatchContext_Impl::doExecute()
// don't scan history picklist if only directories are allowed, picklist contains only files
return;
- sal_Bool bFull = sal_False;
+ bool bFull = false;
INetURLObject aCurObj;
OUString aEmpty, aCurString, aCurMainURL;
@@ -802,7 +802,7 @@ void SvtMatchContext_Impl::doExecute()
}
if( !bFull )
- bFull = sal_True;
+ bFull = true;
else
break;
}
@@ -837,12 +837,12 @@ void SvtURLBox::TryAutoComplete()
SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
: ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ),
eSmartProtocol( eSmart ),
- bAutoCompleteMode( sal_False ),
- bOnlyDirectories( sal_False ),
- bCtrlClick( sal_False ),
- bHistoryDisabled( sal_False ),
- bNoSelection( sal_False ),
- bIsAutoCompleteEnabled( sal_True )
+ bAutoCompleteMode( false ),
+ bOnlyDirectories( false ),
+ bCtrlClick( false ),
+ bHistoryDisabled( false ),
+ bNoSelection( false ),
+ bIsAutoCompleteEnabled( true )
{
Init(bSetDefaultHelpID);
@@ -857,12 +857,12 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart,
bool bSetDefaultHelpID )
: ComboBox( pParent, _nStyle ),
eSmartProtocol( eSmart ),
- bAutoCompleteMode( sal_False ),
- bOnlyDirectories( sal_False ),
- bCtrlClick( sal_False ),
- bHistoryDisabled( sal_False ),
- bNoSelection( sal_False ),
- bIsAutoCompleteEnabled( sal_True )
+ bAutoCompleteMode( false ),
+ bOnlyDirectories( false ),
+ bCtrlClick( false ),
+ bHistoryDisabled( false ),
+ bNoSelection( false ),
+ bIsAutoCompleteEnabled( true )
{
Init(bSetDefaultHelpID);
}
@@ -881,12 +881,12 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
bool bSetDefaultHelpID )
: ComboBox( pParent , _rResId ),
eSmartProtocol( eSmart ),
- bAutoCompleteMode( sal_False ),
- bOnlyDirectories( sal_False ),
- bCtrlClick( sal_False ),
- bHistoryDisabled( sal_False ),
- bNoSelection( sal_False ),
- bIsAutoCompleteEnabled( sal_True )
+ bAutoCompleteMode( false ),
+ bOnlyDirectories( false ),
+ bCtrlClick( false ),
+ bHistoryDisabled( false ),
+ bNoSelection( false ),
+ bIsAutoCompleteEnabled( true )
{
Init(bSetDefaultHelpID);
}
@@ -979,7 +979,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
if ( !aURL.isEmpty() )
{
- sal_Bool bFound = aURL.endsWith("/");
+ bool bFound = aURL.endsWith("/");
if ( !bFound )
{
OUString aUpperURL( aURL );
@@ -1009,7 +1009,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
}
-sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
+bool SvtURLBox::ProcessKey( const KeyCode& rKey )
{
// every key input stops the current matching thread
if( pCtx.is() )
@@ -1028,7 +1028,7 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
if ( bAutoCompleteMode )
{
// reset picklist
- bAutoCompleteMode = sal_False;
+ bAutoCompleteMode = false;
Selection aSelection( GetSelection() );
SetSelection( Selection( aSelection.Min(), aSelection.Min() ) );
if ( bOnlyDirectories )
@@ -1039,19 +1039,19 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
}
bCtrlClick = rKey.IsMod1();
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
if ( GetOpenHdl().IsSet() )
{
- bHandled = sal_True;
+ bHandled = true;
GetOpenHdl().Call(this);
}
else if ( GetSelectHdl().IsSet() )
{
- bHandled = sal_True;
+ bHandled = true;
GetSelectHdl().Call(this);
}
- bCtrlClick = sal_False;
+ bCtrlClick = false;
ClearModifyFlag();
return bHandled;
@@ -1059,9 +1059,9 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
else if ( aCode == KEY_RETURN && GetText().isEmpty() && GetOpenHdl().IsSet() )
{
// for file dialog
- bAutoCompleteMode = sal_False;
+ bAutoCompleteMode = false;
GetOpenHdl().Call(this);
- return sal_True;
+ return true;
}
else if( aCode == KEY_ESCAPE )
{
@@ -1077,15 +1077,15 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
}
else
{
- return sal_False;
+ return false;
}
- bAutoCompleteMode = sal_False;
- return sal_True;
+ bAutoCompleteMode = false;
+ return true;
}
else
{
- return sal_False;
+ return false;
}
}
@@ -1173,7 +1173,7 @@ void SvtURLBox::Select()
}
-void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
+void SvtURLBox::SetOnlyDirectories( bool bDir )
{
bOnlyDirectories = bDir;
if ( bOnlyDirectories )
@@ -1181,7 +1181,7 @@ void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
}
-void SvtURLBox::SetNoURLSelection( sal_Bool bSet )
+void SvtURLBox::SetNoURLSelection( bool bSet )
{
bNoSelection = bSet;
}
@@ -1242,7 +1242,7 @@ OUString SvtURLBox::GetURL()
OUString aFileURL;
Any aAny = UCBContentHelper::GetProperty(aURL, aPropName);
- sal_Bool success = (aAny >>= aFileURL);
+ bool success = (aAny >>= aFileURL);
OUString aTitle;
if(success)
aTitle = INetURLObject(aFileURL).getName(
@@ -1267,7 +1267,7 @@ OUString SvtURLBox::GetURL()
void SvtURLBox::DisableHistory()
{
- bHistoryDisabled = sal_True;
+ bHistoryDisabled = true;
UpdatePicklistForSmartProtocol_Impl();
}
@@ -1285,7 +1285,7 @@ void SvtURLBox::SetBaseURL( const OUString& rURL )
/** Parse leading ~ for Unix systems,
does nothing for Windows
*/
-sal_Bool SvtURLBox_Impl::TildeParsing(
+bool SvtURLBox_Impl::TildeParsing(
OUString&
#ifdef UNX
aText
@@ -1300,7 +1300,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
if( aText.startsWith( "~" ) )
{
OUString aParseTilde;
- sal_Bool bTrailingSlash = sal_True; // use trailing slash
+ bool bTrailingSlash = true; // use trailing slash
if( aText.getLength() == 1 || aText[ 1 ] == '/' )
{
@@ -1314,7 +1314,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
// in case the whole path is just "~" then there should
// be no trailing slash at the end
if( aText.getLength() == 1 )
- bTrailingSlash = sal_False;
+ bTrailingSlash = false;
}
else
{
@@ -1334,19 +1334,19 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
if( !nRes && pPasswd )
aParseTilde = OUString::createFromAscii(pPasswd->pw_dir);
else
- return sal_False; // no such user
+ return false; // no such user
#else
pPasswd = getpwnam( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr() );
if( pPasswd )
aParseTilde = OUString::createFromAscii(pPasswd->pw_dir);
else
- return sal_False; // no such user
+ return false; // no such user
#endif
// in case the path is "~username" then there should
// be no trailing slash at the end
if( nNameEnd == -1 )
- bTrailingSlash = sal_False;
+ bTrailingSlash = false;
}
if( !bTrailingSlash )
@@ -1375,7 +1375,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
}
#endif
- return sal_True;
+ return true;
}
void SvtURLBox::SetFilter(const OUString& _sFilter)
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 615c96922d1b..767ab0e57c58 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -283,9 +283,9 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
return aUIName;
}
-sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
+bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( _nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || _nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE )
{
datatransfer::DataFlavor aFlavor;
@@ -335,7 +335,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
else
_rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE);
}
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 800ca8a2585c..3e01565a92aa 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -50,126 +50,126 @@
struct SvtExtensionResIdMapping_Impl
{
const char* _pExt;
- sal_Bool _bExt;
+ bool _bExt;
sal_uInt16 _nStrId;
sal_uInt16 _nImgId;
};
static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
{
- { "awk", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "bas", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "bat", sal_True, STR_DESCRIPTION_BATCHFILE, 0 },
- { "bmk", sal_False, STR_DESCRIPTION_BOOKMARKFILE, 0 },
- { "bmp", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP },
- { "c", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "cfg", sal_False, STR_DESCRIPTION_CFGFILE, 0 },
- { "cmd", sal_True, STR_DESCRIPTION_BATCHFILE, 0 },
- { "cob", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "com", sal_True, STR_DESCRIPTION_APPLICATION, 0 },
- { "cxx", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "dbf", sal_True, STR_DESCRIPTION_DATABASE_TABLE, IMG_TABLE },
- { "def", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "dll", sal_True, STR_DESCRIPTION_SYSFILE, 0 },
- { "doc", sal_False, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
- { "dot", sal_False, STR_DESCRIPTION_WORD_DOC, IMG_WRITERTEMPLATE },
- { "docx", sal_False, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
- { "dxf", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_DXF },
- { "exe", sal_True, STR_DESCRIPTION_APPLICATION, 0 },
- { "gif", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF },
- { "h", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "hlp", sal_False, STR_DESCRIPTION_HELP_DOC, 0 },
- { "hrc", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "htm", sal_False, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
- { "html", sal_False, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
- { "asp", sal_False, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
- { "hxx", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "ini", sal_False, STR_DESCRIPTION_CFGFILE, 0 },
- { "java", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "jpeg", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
- { "jpg", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
- { "lha", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "awk", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "bas", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "bat", true, STR_DESCRIPTION_BATCHFILE, 0 },
+ { "bmk", false, STR_DESCRIPTION_BOOKMARKFILE, 0 },
+ { "bmp", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP },
+ { "c", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "cfg", false, STR_DESCRIPTION_CFGFILE, 0 },
+ { "cmd", true, STR_DESCRIPTION_BATCHFILE, 0 },
+ { "cob", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "com", true, STR_DESCRIPTION_APPLICATION, 0 },
+ { "cxx", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "dbf", true, STR_DESCRIPTION_DATABASE_TABLE, IMG_TABLE },
+ { "def", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "dll", true, STR_DESCRIPTION_SYSFILE, 0 },
+ { "doc", false, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
+ { "dot", false, STR_DESCRIPTION_WORD_DOC, IMG_WRITERTEMPLATE },
+ { "docx", false, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
+ { "dxf", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_DXF },
+ { "exe", true, STR_DESCRIPTION_APPLICATION, 0 },
+ { "gif", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF },
+ { "h", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "hlp", false, STR_DESCRIPTION_HELP_DOC, 0 },
+ { "hrc", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "htm", false, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
+ { "html", false, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
+ { "asp", false, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
+ { "hxx", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "ini", false, STR_DESCRIPTION_CFGFILE, 0 },
+ { "java", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "jpeg", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
+ { "jpg", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
+ { "lha", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
#ifdef WNT
- { "lnk", sal_False, 0, 0 },
+ { "lnk", false, 0, 0 },
#endif
- { "log", sal_True, STR_DESCRIPTION_LOGFILE, 0 },
- { "lst", sal_True, STR_DESCRIPTION_LOGFILE, 0 },
- { "met", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_MET },
- { "mml", sal_False, STR_DESCRIPTION_MATHML_DOC, IMG_MATH },
- { "mod", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "odb", sal_False, STR_DESCRIPTION_OO_DATABASE_DOC, IMG_OO_DATABASE_DOC },
- { "odg", sal_False, STR_DESCRIPTION_OO_DRAW_DOC, IMG_OO_DRAW_DOC },
- { "odf", sal_False, STR_DESCRIPTION_OO_MATH_DOC, IMG_OO_MATH_DOC },
- { "odm", sal_False, STR_DESCRIPTION_OO_GLOBAL_DOC, IMG_OO_GLOBAL_DOC },
- { "odp", sal_False, STR_DESCRIPTION_OO_IMPRESS_DOC, IMG_OO_IMPRESS_DOC },
- { "ods", sal_False, STR_DESCRIPTION_OO_CALC_DOC, IMG_OO_CALC_DOC },
- { "odt", sal_False, STR_DESCRIPTION_OO_WRITER_DOC, IMG_OO_WRITER_DOC },
- { "otg", sal_False, STR_DESCRIPTION_OO_DRAW_TEMPLATE, IMG_OO_DRAW_TEMPLATE },
- { "otp", sal_False, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE, IMG_OO_IMPRESS_TEMPLATE },
- { "ots", sal_False, STR_DESCRIPTION_OO_CALC_TEMPLATE, IMG_OO_CALC_TEMPLATE },
- { "ott", sal_False, STR_DESCRIPTION_OO_WRITER_TEMPLATE, IMG_OO_WRITER_TEMPLATE },
- { "pas", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "pcd", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD },
- { "pct", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT },
- { "pict", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT },
- { "pcx", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX },
- { "pl", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "png", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PNG },
- { "rar", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "rtf", sal_False, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
- { "sbl", sal_False, 0, 0 },
- { "sch", sal_False, 0, 0 },
- { "sda", sal_False, STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW },
- { "sdb", sal_False, STR_DESCRIPTION_SDATABASE_DOC, IMG_DATABASE },
- { "sdc", sal_False, STR_DESCRIPTION_SCALC_DOC, IMG_CALC },
- { "sdd", sal_False, STR_DESCRIPTION_SIMPRESS_DOC, IMG_IMPRESS },
- { "sdp", sal_False, STR_DESCRIPTION_SIMPRESS_DOC, 0 },
- { "sds", sal_False, STR_DESCRIPTION_SCHART_DOC, 0 },
- { "sdw", sal_False, STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER },
- { "sga", sal_False, 0, 0 },
- { "sgf", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGF },
- { "sgl", sal_False, STR_DESCRIPTION_GLOBALDOC, IMG_GLOBAL_DOC },
- { "sgv", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGV },
- { "shtml", sal_False, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
- { "sim", sal_False, STR_DESCRIPTION_SIMAGE_DOC, IMG_SIM },
- { "smf", sal_False, STR_DESCRIPTION_SMATH_DOC, IMG_MATH },
- { "src", sal_True, STR_DESCRIPTION_SOURCEFILE, 0 },
- { "svh", sal_False, STR_DESCRIPTION_HELP_DOC, 0 },
- { "svm", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SVM },
- { "stc", sal_False, STR_DESCRIPTION_CALC_TEMPLATE, IMG_CALCTEMPLATE },
- { "std", sal_False, STR_DESCRIPTION_DRAW_TEMPLATE, IMG_DRAWTEMPLATE },
- { "sti", sal_False, STR_DESCRIPTION_IMPRESS_TEMPLATE, IMG_IMPRESSTEMPLATE },
- { "stw", sal_False, STR_DESCRIPTION_WRITER_TEMPLATE, IMG_WRITERTEMPLATE },
- { "sxc", sal_False, STR_DESCRIPTION_SXCALC_DOC, IMG_CALC },
- { "sxd", sal_False, STR_DESCRIPTION_SXDRAW_DOC, IMG_DRAW },
- { "sxg", sal_False, STR_DESCRIPTION_SXGLOBAL_DOC, IMG_GLOBAL_DOC },
- { "sxi", sal_False, STR_DESCRIPTION_SXIMPRESS_DOC, IMG_IMPRESS },
- { "sxm", sal_False, STR_DESCRIPTION_SXMATH_DOC, IMG_MATH },
- { "sxs", sal_False, STR_DESCRIPTION_SXCHART_DOC, 0 },
- { "sxw", sal_False, STR_DESCRIPTION_SXWRITER_DOC, IMG_WRITER },
- { "sys", sal_True, STR_DESCRIPTION_SYSFILE, 0 },
- { "tif", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
- { "tiff", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
- { "txt", sal_False, STR_DESCRIPTION_TEXTFILE, IMG_TEXTFILE },
- { "url", sal_False, STR_DESCRIPTION_LINK, 0 },
- { "vor", sal_False, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC, IMG_WRITERTEMPLATE },
- { "vxd", sal_True, STR_DESCRIPTION_SYSFILE, 0 },
- { "wmf", sal_True, STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF },
- { "xls", sal_False, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
- { "xlt", sal_False, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC, IMG_CALCTEMPLATE },
- { "xlsx", sal_False, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
- { "uu", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "uue", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "z", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "zip", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "zoo", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "gz", sal_True, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "ppt", sal_False, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
- { "pot", sal_False, STR_DESCRIPTION_POWERPOINT_TEMPLATE, IMG_IMPRESSTEMPLATE },
- { "pps", sal_False, STR_DESCRIPTION_POWERPOINT_SHOW, IMG_IMPRESS },
- { "pptx", sal_False, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
- { "oxt", sal_False, STR_DESCRIPTION_EXTENSION, IMG_EXTENSION },
- { 0, sal_False, 0, 0 }
+ { "log", true, STR_DESCRIPTION_LOGFILE, 0 },
+ { "lst", true, STR_DESCRIPTION_LOGFILE, 0 },
+ { "met", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_MET },
+ { "mml", false, STR_DESCRIPTION_MATHML_DOC, IMG_MATH },
+ { "mod", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "odb", false, STR_DESCRIPTION_OO_DATABASE_DOC, IMG_OO_DATABASE_DOC },
+ { "odg", false, STR_DESCRIPTION_OO_DRAW_DOC, IMG_OO_DRAW_DOC },
+ { "odf", false, STR_DESCRIPTION_OO_MATH_DOC, IMG_OO_MATH_DOC },
+ { "odm", false, STR_DESCRIPTION_OO_GLOBAL_DOC, IMG_OO_GLOBAL_DOC },
+ { "odp", false, STR_DESCRIPTION_OO_IMPRESS_DOC, IMG_OO_IMPRESS_DOC },
+ { "ods", false, STR_DESCRIPTION_OO_CALC_DOC, IMG_OO_CALC_DOC },
+ { "odt", false, STR_DESCRIPTION_OO_WRITER_DOC, IMG_OO_WRITER_DOC },
+ { "otg", false, STR_DESCRIPTION_OO_DRAW_TEMPLATE, IMG_OO_DRAW_TEMPLATE },
+ { "otp", false, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE, IMG_OO_IMPRESS_TEMPLATE },
+ { "ots", false, STR_DESCRIPTION_OO_CALC_TEMPLATE, IMG_OO_CALC_TEMPLATE },
+ { "ott", false, STR_DESCRIPTION_OO_WRITER_TEMPLATE, IMG_OO_WRITER_TEMPLATE },
+ { "pas", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "pcd", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD },
+ { "pct", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT },
+ { "pict", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT },
+ { "pcx", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX },
+ { "pl", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "png", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PNG },
+ { "rar", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "rtf", false, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
+ { "sbl", false, 0, 0 },
+ { "sch", false, 0, 0 },
+ { "sda", false, STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW },
+ { "sdb", false, STR_DESCRIPTION_SDATABASE_DOC, IMG_DATABASE },
+ { "sdc", false, STR_DESCRIPTION_SCALC_DOC, IMG_CALC },
+ { "sdd", false, STR_DESCRIPTION_SIMPRESS_DOC, IMG_IMPRESS },
+ { "sdp", false, STR_DESCRIPTION_SIMPRESS_DOC, 0 },
+ { "sds", false, STR_DESCRIPTION_SCHART_DOC, 0 },
+ { "sdw", false, STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER },
+ { "sga", false, 0, 0 },
+ { "sgf", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGF },
+ { "sgl", false, STR_DESCRIPTION_GLOBALDOC, IMG_GLOBAL_DOC },
+ { "sgv", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGV },
+ { "shtml", false, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
+ { "sim", false, STR_DESCRIPTION_SIMAGE_DOC, IMG_SIM },
+ { "smf", false, STR_DESCRIPTION_SMATH_DOC, IMG_MATH },
+ { "src", true, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "svh", false, STR_DESCRIPTION_HELP_DOC, 0 },
+ { "svm", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SVM },
+ { "stc", false, STR_DESCRIPTION_CALC_TEMPLATE, IMG_CALCTEMPLATE },
+ { "std", false, STR_DESCRIPTION_DRAW_TEMPLATE, IMG_DRAWTEMPLATE },
+ { "sti", false, STR_DESCRIPTION_IMPRESS_TEMPLATE, IMG_IMPRESSTEMPLATE },
+ { "stw", false, STR_DESCRIPTION_WRITER_TEMPLATE, IMG_WRITERTEMPLATE },
+ { "sxc", false, STR_DESCRIPTION_SXCALC_DOC, IMG_CALC },
+ { "sxd", false, STR_DESCRIPTION_SXDRAW_DOC, IMG_DRAW },
+ { "sxg", false, STR_DESCRIPTION_SXGLOBAL_DOC, IMG_GLOBAL_DOC },
+ { "sxi", false, STR_DESCRIPTION_SXIMPRESS_DOC, IMG_IMPRESS },
+ { "sxm", false, STR_DESCRIPTION_SXMATH_DOC, IMG_MATH },
+ { "sxs", false, STR_DESCRIPTION_SXCHART_DOC, 0 },
+ { "sxw", false, STR_DESCRIPTION_SXWRITER_DOC, IMG_WRITER },
+ { "sys", true, STR_DESCRIPTION_SYSFILE, 0 },
+ { "tif", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
+ { "tiff", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
+ { "txt", false, STR_DESCRIPTION_TEXTFILE, IMG_TEXTFILE },
+ { "url", false, STR_DESCRIPTION_LINK, 0 },
+ { "vor", false, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC, IMG_WRITERTEMPLATE },
+ { "vxd", true, STR_DESCRIPTION_SYSFILE, 0 },
+ { "wmf", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF },
+ { "xls", false, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
+ { "xlt", false, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC, IMG_CALCTEMPLATE },
+ { "xlsx", false, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
+ { "uu", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "uue", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "z", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "zip", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "zoo", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "gz", true, STR_DESCRIPTION_ARCHIVFILE, 0 },
+ { "ppt", false, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
+ { "pot", false, STR_DESCRIPTION_POWERPOINT_TEMPLATE, IMG_IMPRESSTEMPLATE },
+ { "pps", false, STR_DESCRIPTION_POWERPOINT_SHOW, IMG_IMPRESS },
+ { "pptx", false, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
+ { "oxt", false, STR_DESCRIPTION_EXTENSION, IMG_EXTENSION },
+ { 0, false, 0, 0 }
};
struct SvtFactory2ExtensionMapping_Impl
@@ -297,9 +297,9 @@ static sal_uInt16 GetImageId_Impl( const OUString& rExtension )
return nImage;
}
-static sal_Bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::VolumeInfo& rVolumeInfo )
+static bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::VolumeInfo& rVolumeInfo )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
@@ -351,7 +351,7 @@ static sal_uInt16 GetFolderImageId_Impl( const OUString& rURL )
return nRet;
}
-static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
+static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFolder )
{
OUString aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE );
sal_uInt16 nImage = IMG_FILE;
@@ -406,7 +406,7 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetec
return nImage;
}
-static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, sal_Bool& rbShowExt )
+static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt )
{
sal_uInt16 nId = 0;
sal_Int32 nIndex = GetIndexOfExtension_Impl( rExtension );
@@ -477,7 +477,7 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
return nRet;
}
-static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
+static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
{
if ( !bBig && IMG_FOLDER == nImageId )
// return our new small folder image (256 colors)
@@ -516,13 +516,13 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
return Image();
}
-OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
+OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder )
{
OUString sExtension(rObject.getExtension());
OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::NO_DECODE ) );
sal_uInt16 nResId = 0;
- sal_Bool bShowExt = sal_False, bDetected = sal_False, bOnlyFile = sal_False;
- sal_Bool bFolder = bDetectFolder ? CONTENT_HELPER::IsFolder( sURL ) : sal_False;
+ bool bShowExt = false, bDetected = false, bOnlyFile = false;
+ bool bFolder = bDetectFolder && CONTENT_HELPER::IsFolder( sURL );
if ( !bFolder )
{
if ( !bDetected )
@@ -534,7 +534,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
if ( aType == "factory" )
{
sDescription = GetDescriptionByFactory_Impl( aURLPath.copy( aURLPath.indexOf( INET_PATH_TOKEN ) + 1 ) );
- bDetected = sal_True;
+ bDetected = true;
}
}
@@ -562,7 +562,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
{
if ( bOnlyFile )
{
- bShowExt = sal_False;
+ bShowExt = false;
sExtension = sExtension.toAsciiUpperCase();
sDescription = sExtension;
sDescription += "-";
@@ -583,23 +583,23 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
return sDescription;
}
-Image SvFileInformationManager::GetImage( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetImage( const INetURLObject& rObject, bool bBig )
{
- sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
+ sal_uInt16 nImage = GetImageId_Impl( rObject, true );
DBG_ASSERT( nImage, "invalid ImageId" );
return GetImageFromList_Impl( nImage, bBig );
}
-Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, bool bBig )
{
- sal_Int16 nImage = GetImageId_Impl( rObject, sal_False );
+ sal_Int16 nImage = GetImageId_Impl( rObject, false );
DBG_ASSERT( nImage, "invalid ImageId" );
return GetImageFromList_Impl( nImage, bBig );
}
-Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, bool bBig )
{
- sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
+ sal_uInt16 nImage = GetImageId_Impl( rObject, true );
DBG_ASSERT( nImage, "invalid ImageId" );
if ( nImage == IMG_FILE )
@@ -608,7 +608,7 @@ Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject,
return GetImageFromList_Impl( nImage, bBig );
}
-Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig )
+Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, bool bBig )
{
sal_uInt16 nImage = IMG_FOLDER;
DBG_ASSERT( nImage, "invalid ImageId" );
@@ -627,12 +627,12 @@ Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo
OUString SvFileInformationManager::GetDescription( const INetURLObject& rObject )
{
- return SvFileInformationManager::GetDescription_Impl( rObject, sal_True );
+ return SvFileInformationManager::GetDescription_Impl( rObject, true );
}
OUString SvFileInformationManager::GetFileDescription( const INetURLObject& rObject )
{
- return SvFileInformationManager::GetDescription_Impl( rObject, sal_False );
+ return SvFileInformationManager::GetDescription_Impl( rObject, false );
}
OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo )
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 4ec9146c24a6..6fce7f7952ae 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -53,7 +53,7 @@ IMapObject::IMapObject()
}
IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OUString& rDesc,
- const OUString& rTarget, const OUString& rName, sal_Bool bURLActive )
+ const OUString& rTarget, const OUString& rName, bool bURLActive )
: aURL( rURL )
, aAltText( rAltText )
, aDesc( rDesc )
@@ -119,7 +119,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
rIStm.ReadUInt16( nTextEncoding );
aURL = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
aAltText = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
- rIStm.ReadUChar( bActive );
+ rIStm.ReadCharAsBool( bActive );
aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
// make URL absolute
@@ -141,7 +141,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
delete pCompat;
}
-sal_Bool IMapObject::IsEqual( const IMapObject& rEqObj )
+bool IMapObject::IsEqual( const IMapObject& rEqObj )
{
return ( ( aURL == rEqObj.aURL ) &&
( aAltText == rEqObj.aAltText ) &&
@@ -157,14 +157,14 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bURLActive,
- sal_Bool bPixelCoords ) :
+ bool bURLActive,
+ bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
{
ImpConstruct( rRect, bPixelCoords );
}
-void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, sal_Bool bPixel )
+void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, bool bPixel )
{
if ( bPixel )
aRect = Application::GetDefaultDevice()->PixelToLogic( rRect, MapMode( MAP_100TH_MM ) );
@@ -215,12 +215,12 @@ sal_uInt16 IMapRectangleObject::GetType() const
|*
\******************************************************************************/
-sal_Bool IMapRectangleObject::IsHit( const Point& rPoint ) const
+bool IMapRectangleObject::IsHit( const Point& rPoint ) const
{
return aRect.IsInside( rPoint );
}
-Rectangle IMapRectangleObject::GetRectangle( sal_Bool bPixelCoords ) const
+Rectangle IMapRectangleObject::GetRectangle( bool bPixelCoords ) const
{
Rectangle aNewRect;
@@ -246,7 +246,7 @@ void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY
aRect = Rectangle( aTL, aBR );
}
-sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
+bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
{
return ( IMapObject::IsEqual( rEqObj ) && ( aRect == rEqObj.aRect ) );
}
@@ -257,14 +257,14 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadiu
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bURLActive,
- sal_Bool bPixelCoords ) :
+ bool bURLActive,
+ bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
{
ImpConstruct( rCenter, nCircleRadius, bPixelCoords );
}
-void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel )
+void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel )
{
if ( bPixel )
{
@@ -331,21 +331,21 @@ sal_uInt16 IMapCircleObject::GetType() const
|*
\******************************************************************************/
-sal_Bool IMapCircleObject::IsHit( const Point& rPoint ) const
+bool IMapCircleObject::IsHit( const Point& rPoint ) const
{
const Point aPoint( aCenter - rPoint );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( (sal_Int32) sqrt( (double) aPoint.X() * aPoint.X() +
aPoint.Y() * aPoint.Y() ) <= nRadius )
{
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
-Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const
+Point IMapCircleObject::GetCenter( bool bPixelCoords ) const
{
Point aNewPoint;
@@ -357,7 +357,7 @@ Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const
return aNewPoint;
}
-sal_uLong IMapCircleObject::GetRadius( sal_Bool bPixelCoords ) const
+sal_uLong IMapCircleObject::GetRadius( bool bPixelCoords ) const
{
sal_uLong nNewRadius;
@@ -392,7 +392,7 @@ void IMapCircleObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
nRadius = ( nRadius * aAverage.GetNumerator() ) / aAverage.GetDenominator();
}
-sal_Bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
+bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
{
return ( IMapObject::IsEqual( rEqObj ) &&
( aCenter == rEqObj.aCenter ) &&
@@ -405,15 +405,15 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bURLActive,
- sal_Bool bPixelCoords ) :
+ bool bURLActive,
+ bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
- bEllipse ( sal_False )
+ bEllipse ( false )
{
ImpConstruct( rPoly, bPixelCoords );
}
-void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, sal_Bool bPixel )
+void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, bool bPixel )
{
if ( bPixel )
aPoly = Application::GetDefaultDevice()->PixelToLogic( rPoly, MapMode( MAP_100TH_MM ) );
@@ -449,7 +449,7 @@ void IMapPolygonObject::ReadIMapObject( SvStream& rIStm )
// Version >= 2 has additional ellipses information
if ( nReadVersion >= 2 )
{
- rIStm.ReadUChar( bEllipse );
+ rIStm.ReadCharAsBool( bEllipse );
ReadRectangle( rIStm, aEllipse );
}
}
@@ -473,12 +473,12 @@ sal_uInt16 IMapPolygonObject::GetType() const
|*
\******************************************************************************/
-sal_Bool IMapPolygonObject::IsHit( const Point& rPoint ) const
+bool IMapPolygonObject::IsHit( const Point& rPoint ) const
{
return aPoly.IsInside( rPoint );
}
-Polygon IMapPolygonObject::GetPolygon( sal_Bool bPixelCoords ) const
+Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const
{
Polygon aNewPoly;
@@ -494,7 +494,7 @@ void IMapPolygonObject::SetExtraEllipse( const Rectangle& rEllipse )
{
if ( aPoly.GetSize() )
{
- bEllipse = sal_True;
+ bEllipse = true;
aEllipse = rEllipse;
}
}
@@ -530,16 +530,16 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
}
}
-sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
+bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( IMapObject::IsEqual( rEqObj ) )
{
- const Polygon& rEqPoly = rEqObj.aPoly;
- const sal_uInt16 nCount = aPoly.GetSize();
- const sal_uInt16 nEqCount = rEqPoly.GetSize();
- sal_Bool bDifferent = sal_False;
+ const Polygon& rEqPoly = rEqObj.aPoly;
+ const sal_uInt16 nCount = aPoly.GetSize();
+ const sal_uInt16 nEqCount = rEqPoly.GetSize();
+ bool bDifferent = false;
if ( nCount == nEqCount )
{
@@ -547,13 +547,13 @@ sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
{
if ( aPoly[ i ] != rEqPoly[ i ] )
{
- bDifferent = sal_True;
+ bDifferent = true;
break;
}
}
if ( !bDifferent )
- bRet = sal_True;
+ bRet = true;
}
}
@@ -686,15 +686,15 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
|*
\******************************************************************************/
-sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
+bool ImageMap::operator==( const ImageMap& rImageMap )
{
const size_t nCount = maList.size();
const size_t nEqCount = rImageMap.GetIMapObjectCount();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( nCount == nEqCount )
{
- sal_Bool bDifferent = ( aName != rImageMap.aName );
+ bool bDifferent = ( aName != rImageMap.aName );
for ( size_t i = 0; ( i < nCount ) && !bDifferent; i++ )
{
@@ -708,21 +708,21 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
case( IMAP_OBJ_RECTANGLE ):
{
if ( !( (IMapRectangleObject*) pObj )->IsEqual( *(IMapRectangleObject*) pEqObj ) )
- bDifferent = sal_True;
+ bDifferent = true;
}
break;
case( IMAP_OBJ_CIRCLE ):
{
if ( !( (IMapCircleObject*) pObj )->IsEqual( *(IMapCircleObject*) pEqObj ) )
- bDifferent = sal_True;
+ bDifferent = true;
}
break;
case( IMAP_OBJ_POLYGON ):
{
if ( !( (IMapPolygonObject*) pObj )->IsEqual( *(IMapPolygonObject*) pEqObj ) )
- bDifferent = sal_True;
+ bDifferent = true;
}
break;
@@ -731,11 +731,11 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
}
}
else
- bDifferent = sal_True;
+ bDifferent = true;
}
if ( !bDifferent )
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -748,7 +748,7 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
|*
\******************************************************************************/
-sal_Bool ImageMap::operator!=( const ImageMap& rImageMap )
+bool ImageMap::operator!=( const ImageMap& rImageMap )
{
return !( *this == rImageMap );
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index e8709576220f..e0a26d61fbcf 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -207,7 +207,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
{
case IMAP_OBJ_RECTANGLE:
{
- const Rectangle aRect( ((IMapRectangleObject*)&rMapObject)->GetRectangle(sal_False) );
+ const Rectangle aRect( ((IMapRectangleObject*)&rMapObject)->GetRectangle(false) );
maBoundary.X = aRect.Left();
maBoundary.Y = aRect.Top();
maBoundary.Width = aRect.GetWidth();
@@ -216,8 +216,8 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
break;
case IMAP_OBJ_CIRCLE:
{
- mnRadius = (sal_Int32)((IMapCircleObject*)&rMapObject)->GetRadius(sal_False);
- const Point aPoint( ((IMapCircleObject*)&rMapObject)->GetCenter(sal_False) );
+ mnRadius = (sal_Int32)((IMapCircleObject*)&rMapObject)->GetRadius(false);
+ const Point aPoint( ((IMapCircleObject*)&rMapObject)->GetCenter(false) );
maCenter.X = aPoint.X();
maCenter.Y = aPoint.Y();
@@ -226,7 +226,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
case IMAP_OBJ_POLYGON:
default:
{
- const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(sal_False) );
+ const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(false) );
const sal_uInt16 nCount = aPoly.GetSize();
maPolygon.realloc( nCount );
@@ -267,14 +267,14 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
case IMAP_OBJ_RECTANGLE:
{
const Rectangle aRect( maBoundary.X, maBoundary.Y, maBoundary.X + maBoundary.Width - 1, maBoundary.Y + maBoundary.Height - 1 );
- pNewIMapObject = new IMapRectangleObject( aRect, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+ pNewIMapObject = new IMapRectangleObject( aRect, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
}
break;
case IMAP_OBJ_CIRCLE:
{
const Point aCenter( maCenter.X, maCenter.Y );
- pNewIMapObject = new IMapCircleObject( aCenter, mnRadius, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+ pNewIMapObject = new IMapCircleObject( aCenter, mnRadius, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
}
break;
@@ -291,7 +291,7 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
}
aPoly.Optimize( POLY_OPTIMIZE_CLOSE );
- pNewIMapObject = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+ pNewIMapObject = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
}
break;
}
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index c4dc4beb81d3..582136bf1c85 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -25,9 +25,9 @@
static const sal_Unicode TOKEN_SEPARATOR = '\001';
-sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
+bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch( nFormat )
{
case SOT_FORMATSTR_ID_INET_IMAGE:
@@ -57,9 +57,9 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
return bRet;
}
-sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
+bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch( nFormat )
{
case SOT_FORMATSTR_ID_INET_IMAGE:
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index d048f8c16d7e..da20aec4d324 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -182,7 +182,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
case( IMAP_OBJ_RECTANGLE ):
{
IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*) pIMapObj;
- Rectangle aDrawRect( pIMapRectObj->GetRectangle( sal_False ) );
+ Rectangle aDrawRect( pIMapRectObj->GetRectangle( false ) );
// clipped on CanvasPane
aDrawRect.Intersection( aClipRect );
@@ -195,8 +195,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
case( IMAP_OBJ_CIRCLE ):
{
IMapCircleObject* pIMapCircleObj = (IMapCircleObject*) pIMapObj;
- const Point aCenter( pIMapCircleObj->GetCenter( sal_False ) );
- const long nRadius = pIMapCircleObj->GetRadius( sal_False );
+ const Point aCenter( pIMapCircleObj->GetCenter( false ) );
+ const long nRadius = pIMapCircleObj->GetRadius( false );
const Point aOffset( nRadius, nRadius );
Rectangle aCircle( aCenter - aOffset, aCenter + aOffset );
@@ -224,7 +224,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
}
else
{
- const Polygon& rPoly = pIMapPolyObj->GetPolygon( sal_False );
+ const Polygon& rPoly = pIMapPolyObj->GetPolygon( false );
Polygon aDrawPoly( rPoly );
// clipped on CanvasPane
@@ -289,7 +289,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_RECT ):
{
SdrRectObj* pRectObj = (SdrRectObj*) &rObj;
- IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), "", "", "", "", "", sal_True, sal_False );
+ IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), "", "", "", "", "", true, false );
pRectObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -302,7 +302,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
delete pPathObj;
- IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), "", "", "", "", "", sal_True, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), "", "", "", "", "", true, false );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
pCircObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -319,7 +319,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, "", "", "", "", "", sal_True, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, "", "", "", "", "", true, false );
pPathObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
}
@@ -357,7 +357,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
case( OBJ_RECT ):
{
pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
- aURL, aAltText, aDesc, aTarget, "", bActive, sal_False ) ) );
+ aURL, aAltText, aDesc, aTarget, "", bActive, false ) ) );
}
break;
@@ -367,7 +367,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( false, false );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, false );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
// was only created by us temporarily
@@ -387,7 +387,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, false );
pUserData->ReplaceObject( IMapObjectPtr(pObj) );
}
}