summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-20 14:38:38 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:10 +0200
commit7a679ee19c3a18d89277c28b12bf81911acfef85 (patch)
tree4a98a2beb9997a9c4ba66bc01a4f40b9d15f60b1 /include
parent554e54429c586468778cea4a4571b80de7d28d8d (diff)
svtools: sal_Bool->bool
Change-Id: I35c9c1514c67860e61b6e2457ab4548d04a4d159
Diffstat (limited to 'include')
-rw-r--r--include/svtools/headbar.hxx48
-rw-r--r--include/svtools/helpopt.hxx12
-rw-r--r--include/svtools/htmlcfg.hxx30
-rw-r--r--include/svtools/htmlout.hxx8
-rw-r--r--include/svtools/hyperlabel.hxx2
5 files changed, 50 insertions, 50 deletions
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index f4560fb08149..94f30889b849 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -246,14 +246,14 @@ private:
long mnStartPos;
long mnDragPos;
long mnMouseOff;
- sal_uInt16 mnCurItemId;
- sal_uInt16 mnItemDragPos;
- sal_Bool mbDragable;
- sal_Bool mbDrag;
- sal_Bool mbItemDrag;
- sal_Bool mbOutDrag;
- sal_Bool mbButtonStyle;
- sal_Bool mbItemMode;
+ sal_uInt16 mnCurItemId;
+ sal_uInt16 mnItemDragPos;
+ bool mbDragable;
+ bool mbDrag;
+ bool mbItemDrag;
+ bool mbOutDrag;
+ bool mbButtonStyle;
+ bool mbItemMode;
Link maStartDragHdl;
Link maDragHdl;
Link maEndDragHdl;
@@ -270,25 +270,25 @@ private:
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
- SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
+ SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
SVT_DLLPRIVATE Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
using Window::ImplHitTest;
SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
SVT_DLLPRIVATE void ImplDrawItem( OutputDevice* pDev,
- sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+ sal_uInt16 nPos, bool bHigh, bool bDrag,
const Rectangle& rItemRect,
const Rectangle* pRect,
sal_uLong nFlags );
- SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh = sal_False,
- sal_Bool bDrag = sal_False,
+ SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, bool bHigh = false,
+ bool bDrag = false,
const Rectangle* pRect = NULL );
SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
- sal_Bool bEnd = sal_False, sal_Bool bDirect = sal_False );
- SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, sal_Bool bCommand );
+ bool bEnd = false, bool bDirect = false );
+ SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
- SVT_DLLPRIVATE void ImplEndDrag( sal_Bool bCancel );
+ SVT_DLLPRIVATE void ImplEndDrag( bool bCancel );
public:
HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR );
@@ -324,16 +324,16 @@ public:
inline void SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; }
long GetDragSize() const { return mnDragSize; }
- sal_uInt16 GetItemCount() const;
- sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
- sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
- sal_uInt16 GetItemId( const Point& rPos ) const;
+ sal_uInt16 GetItemCount() const;
+ sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
+ sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
+ sal_uInt16 GetItemId( const Point& rPos ) const;
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
- sal_uInt16 GetCurItemId() const { return mnCurItemId; }
+ sal_uInt16 GetCurItemId() const { return mnCurItemId; }
long GetDragPos() const { return mnDragPos; }
- sal_uInt16 GetItemDragPos() const { return mnItemDragPos; }
- sal_Bool IsItemMode() const { return mbItemMode; }
- sal_Bool IsItemDrag() const { return mbItemDrag; }
+ sal_uInt16 GetItemDragPos() const { return mnItemDragPos; }
+ bool IsItemMode() const { return mbItemMode; }
+ bool IsItemDrag() const { return mbItemDrag; }
void SetItemSize( sal_uInt16 nItemId, long nNewSize );
long GetItemSize( sal_uInt16 nItemId ) const;
@@ -366,7 +366,7 @@ public:
inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; }
- inline sal_Bool IsDragable() const { return mbDragable; }
+ inline bool IsDragable() const { return mbDragable; }
/** Creates and returns the accessible object of the header bar. */
virtual ::com::sun::star::uno::Reference<
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 75ea3b89faa2..c9f44c7aedd3 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -35,16 +35,16 @@ public:
SvtHelpOptions();
virtual ~SvtHelpOptions();
- void SetExtendedHelp( sal_Bool b );
- bool IsExtendedHelp() const;
- void SetHelpTips( sal_Bool b );
- bool IsHelpTips() const;
+ void SetExtendedHelp( bool b );
+ bool IsExtendedHelp() const;
+ void SetHelpTips( bool b );
+ bool IsHelpTips() const;
const OUString& GetHelpStyleSheet()const;
void SetHelpStyleSheet(const OUString& rStyleSheet);
- void SetWelcomeScreen( sal_Bool b );
- sal_Bool IsWelcomeScreen() const;
+ void SetWelcomeScreen( bool b );
+ bool IsWelcomeScreen() const;
OUString GetSystem() const;
};
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 678c417b54df..e06c7e93b77e 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -52,34 +52,34 @@ public:
sal_uInt16 GetFontSize(sal_uInt16 nPos) const;
void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize);
- sal_Bool IsImportUnknown() const;
- void SetImportUnknown(sal_Bool bSet);
+ bool IsImportUnknown() const;
+ void SetImportUnknown(bool bSet);
sal_uInt16 GetExportMode() const;
void SetExportMode(sal_uInt16 nSet);
- sal_Bool IsStarBasic() const;
- void SetStarBasic(sal_Bool bSet);
+ bool IsStarBasic() const;
+ void SetStarBasic(bool bSet);
- sal_Bool IsStarBasicWarning() const;
- void SetStarBasicWarning(sal_Bool bSet);
+ bool IsStarBasicWarning() const;
+ void SetStarBasicWarning(bool bSet);
- sal_Bool IsSaveGraphicsLocal() const;
- void SetSaveGraphicsLocal(sal_Bool bSet);
+ bool IsSaveGraphicsLocal() const;
+ void SetSaveGraphicsLocal(bool bSet);
- sal_Bool IsPrintLayoutExtension() const;
- void SetPrintLayoutExtension(sal_Bool bSet);
+ bool IsPrintLayoutExtension() const;
+ void SetPrintLayoutExtension(bool bSet);
- sal_Bool IsIgnoreFontFamily() const;
- void SetIgnoreFontFamily(sal_Bool bSet);
+ bool IsIgnoreFontFamily() const;
+ void SetIgnoreFontFamily(bool bSet);
- sal_Bool IsDefaultTextEncoding() const;
+ bool IsDefaultTextEncoding() const;
rtl_TextEncoding GetTextEncoding() const;
void SetTextEncoding( rtl_TextEncoding );
static SvxHtmlOptions& Get();
- sal_Bool IsNumbersEnglishUS() const;
- void SetNumbersEnglishUS(sal_Bool bSet);
+ bool IsNumbersEnglishUS() const;
+ void SetNumbersEnglishUS(bool bSet);
};
#endif
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index c13d6b92713f..9ae7f1918209 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -56,7 +56,7 @@ struct HTMLOutFuncs
OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr,
- sal_Bool bOn = sal_True,
+ bool bOn = true,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252);
SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
HTMLOutContext& rContext,
@@ -70,7 +70,7 @@ struct HTMLOutFuncs
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&,
const HTMLOutEvent *pEventTable,
- sal_Bool bOutStarBasic,
+ bool bOutStarBasic,
const sal_Char *pDelim = 0,
const sal_Char *pIndentArea = 0,
const sal_Char *pIndentMap = 0,
@@ -92,13 +92,13 @@ struct HTMLOutFuncs
// der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem
// nur aus 0 bestehen Eintrag terminiert ist.
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&,
- const HTMLOutEvent*, sal_Bool bOutStarBasic,
+ const HTMLOutEvent*, bool bOutStarBasic,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
- sal_Bool bValue, double fVal, sal_uLong nFormat,
+ bool bValue, double fVal, sal_uLong nFormat,
SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0);
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index 502a1bb7a2c6..954cd4d6a96b 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -66,7 +66,7 @@ namespace svt
void SetLabel( const OUString& _rText );
void ToggleBackgroundColor( const Color& _rGBColor );
- void SetInteractive( sal_Bool _bInteractive );
+ void SetInteractive( bool _bInteractive );
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
const Link& GetClickHdl() const { return maClickHdl; }