diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-20 09:26:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-24 08:12:08 +0200 |
commit | b1de52241c1c2045ceab4ea3526f51f145be2930 (patch) | |
tree | 29f016cdbb4b1e8742edca44f4adf8427b7e5e96 /include | |
parent | 1a1fe47731bed27e974094a86b16f91e768c6dc0 (diff) |
svtools: sal_Bool->bool
Change-Id: Iaa489318f25107e91fc8133523fbd9d724493314
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/calendar.hxx | 60 | ||||
-rw-r--r-- | include/svtools/cliplistener.hxx | 2 | ||||
-rw-r--r-- | include/svtools/colorcfg.hxx | 26 | ||||
-rw-r--r-- | include/svtools/ctrlbox.hxx | 32 | ||||
-rw-r--r-- | include/svtools/ctrltool.hxx | 14 |
5 files changed, 67 insertions, 67 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 265621d6f90c..e92d9d513ac7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -183,7 +183,7 @@ private: Color* mpStandardColor; Color* mpSaturdayColor; Color* mpSundayColor; - sal_uLong mnDayCount; + sal_uLong mnDayCount; long mnDaysOffX; long mnWeekDayOffY; long mnDaysOffY; @@ -195,10 +195,10 @@ private: long mnDayHeight; long mnWeekWidth; WinBits mnWinStyle; - sal_uInt16 mnFirstYear; - sal_uInt16 mnLastYear; - sal_uInt16 mnRequestYear; - sal_Bool mbCalc:1, + sal_uInt16 mnFirstYear; + sal_uInt16 mnLastYear; + sal_uInt16 mnRequestYear; + bool mbCalc:1, mbFormat:1, mbDrag:1, mbSelection:1, @@ -232,24 +232,24 @@ private: SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin( sal_Bool bDrawPrev = sal_True, sal_Bool bDrawNext = sal_True ); + SVT_DLLPRIVATE void ImplDrawSpin( bool bDrawPrev = true, bool bDrawNext = true ); SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, - sal_Bool bBack = sal_True, sal_Bool bOther = sal_False, + bool bBack = true, bool bOther = false, sal_uLong nToday = 0 ); - SVT_DLLPRIVATE void ImplDraw( sal_Bool bPaint = sal_False ); + SVT_DLLPRIVATE void ImplDraw( bool bPaint = false ); SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); SVT_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld ); SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, - sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended ); - SVT_DLLPRIVATE void ImplUpdate( sal_Bool bCalcNew = sal_False ); + bool bMove, bool bExpand, bool bExtended ); + SVT_DLLPRIVATE void ImplUpdate( bool bCalcNew = false ); using Window::ImplScroll; - SVT_DLLPRIVATE void ImplScroll( sal_Bool bPrev ); + SVT_DLLPRIVATE void ImplScroll( bool bPrev ); SVT_DLLPRIVATE void ImplInvertDropPos(); SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( sal_Bool bCancel ); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( bool bCancel ); SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; protected: @@ -282,24 +282,24 @@ public: const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } - void SelectDate( const Date& rDate, sal_Bool bSelect = sal_True ); + void SelectDate( const Date& rDate, bool bSelect = true ); void SetNoSelection(); - sal_Bool IsDateSelected( const Date& rDate ) const; + bool IsDateSelected( const Date& rDate ) const; Date GetFirstSelectedDate() const; - void EnableCallEverySelect( sal_Bool bEvery = sal_True ) { mbAllSel = bEvery; } - sal_Bool IsCallEverySelectEnabled() const { return mbAllSel; } + void EnableCallEverySelect( bool bEvery = true ) { mbAllSel = bEvery; } + bool IsCallEverySelectEnabled() const { return mbAllSel; } - sal_uInt16 GetRequestYear() const { return mnRequestYear; } + sal_uInt16 GetRequestYear() const { return mnRequestYear; } void SetCurDate( const Date& rNewDate ); Date GetCurDate() const { return maCurDate; } void SetFirstDate( const Date& rNewFirstDate ); Date GetFirstDate() const { return maFirstDate; } Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - sal_uLong GetDayCount() const { return mnDayCount; } + sal_uLong GetDayCount() const { return mnDayCount; } Date GetFirstMonth() const; Date GetLastMonth() const; - sal_uInt16 GetMonthCount() const; - sal_Bool GetDate( const Point& rPos, Date& rDate ) const; + sal_uInt16 GetMonthCount() const; + bool GetDate( const Point& rPos, Date& rDate ) const; Rectangle GetDateRect( const Date& rDate ) const; long GetCurMonthPerLine() const { return mnMonthPerLine; } @@ -312,9 +312,9 @@ public: void StartSelection(); void EndSelection(); - sal_Bool IsTravelSelect() const { return mbTravelSelect; } - sal_Bool IsScrollDateRangeChanged() const { return mbScrollDateRange; } - sal_Bool IsSelectLeft() const { return mbSelLeft; } + bool IsTravelSelect() const { return mbTravelSelect; } + bool IsScrollDateRangeChanged() const { return mbScrollDateRange; } + bool IsSelectLeft() const { return mbSelLeft; } Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; @@ -406,8 +406,8 @@ private: PushButton* mpTodayBtn; PushButton* mpNoneBtn; Date maDefaultDate; - sal_Bool mbToday; - sal_Bool mbNone; + bool mbToday; + bool mbNone; Link maSelectHdl; DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); @@ -427,10 +427,10 @@ public: void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } Date GetDefaultDate() const { return maDefaultDate; } - void EnableToday( sal_Bool bToday = sal_True ) { mbToday = bToday; } - sal_Bool IsTodayEnabled() const { return mbToday; } - void EnableNone( sal_Bool bNone = sal_True ) { mbNone = bNone; } - sal_Bool IsNoneEnabled() const { return mbNone; } + void EnableToday( bool bToday = true ) { mbToday = bToday; } + bool IsTodayEnabled() const { return mbToday; } + void EnableNone( bool bNone = true ) { mbNone = bNone; } + bool IsNoneEnabled() const { return mbNone; } void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } WinBits GetCalendarStyle() const { return mnCalendarStyle; } diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 0d77c9dbaab6..5003d1e222da 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -38,7 +38,7 @@ public: TransferableClipboardListener( const Link& rCallback ); ~TransferableClipboardListener(); - void AddRemoveListener( Window* pWin, sal_Bool bAdd ); + void AddRemoveListener( Window* pWin, bool bAdd ); void ClearCallbackLink(); // XEventListener diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 9d5f5d2ec8c5..8e79226aecb7 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -84,10 +84,10 @@ class ColorConfig_Impl; struct ColorConfigValue { - sal_Bool bIsVisible; //validity depends on the element type + bool bIsVisible; //validity depends on the element type sal_Int32 nColor; - ColorConfigValue() : bIsVisible(sal_False), nColor(0) {} - sal_Bool operator !=(const ColorConfigValue& rCmp) const + ColorConfigValue() : bIsVisible(false), nColor(0) {} + bool operator !=(const ColorConfigValue& rCmp) const { return nColor != rCmp.nColor || bIsVisible != rCmp.bIsVisible;} }; @@ -103,7 +103,7 @@ public: // get the configured value - if bSmart is set the default color setting is provided // instead of the automatic color - ColorConfigValue GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart = sal_True)const; + ColorConfigValue GetColorValue(ColorConfigEntry eEntry, bool bSmart = true) const; static Color GetDefaultColor(ColorConfigEntry eEntry); void Reload(); }; @@ -111,23 +111,23 @@ public: class SVT_DLLPUBLIC EditableColorConfig { ColorConfig_Impl* m_pImpl; - sal_Bool m_bModified; + bool m_bModified; public: EditableColorConfig(); ~EditableColorConfig(); - ::com::sun::star::uno::Sequence< OUString > GetSchemeNames() const; - void DeleteScheme(const OUString& rScheme ); - void AddScheme(const OUString& rScheme ); - sal_Bool LoadScheme(const OUString& rScheme ); - const OUString& GetCurrentSchemeName()const; + ::css::uno::Sequence< OUString > GetSchemeNames() const; + void DeleteScheme(const OUString& rScheme ); + void AddScheme(const OUString& rScheme ); + bool LoadScheme(const OUString& rScheme ); + const OUString& GetCurrentSchemeName() const; void SetCurrentSchemeName(const OUString& rScheme); - const ColorConfigValue& GetColorValue(ColorConfigEntry eEntry)const; + const ColorConfigValue& GetColorValue(ColorConfigEntry eEntry) const; void SetColorValue(ColorConfigEntry eEntry, const ColorConfigValue& rValue); void SetModified(); - void ClearModified(){m_bModified = sal_False;} - sal_Bool IsModified()const{return m_bModified;} + void ClearModified() {m_bModified = false;} + bool IsModified() const {return m_bModified;} void Commit(); void DisableBroadcast(); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 7b3e38d1fbce..c4aedb7a8899 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -185,9 +185,9 @@ public: virtual Color GetEntryColor( sal_Int32 nPos ) const; Size GetImageSize() const { return aImageSize; } - void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True ) + void SelectEntry( const OUString& rStr, bool bSelect = true ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( const Color& rColor, sal_Bool bSelect = sal_True ); + void SelectEntry( const Color& rColor, bool bSelect = true ); Color GetSelectEntryColor( sal_Int32 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr ) const { @@ -212,7 +212,7 @@ private: void* GetEntryData( sal_Int32 nPos ) const; }; -inline void ColorListBox::SelectEntry( const Color& rColor, sal_Bool bSelect ) +inline void ColorListBox::SelectEntry( const Color& rColor, bool bSelect ) { sal_Int32 nPos = GetEntryPos( rColor ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -303,7 +303,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox sal_uInt16 nStyle, Bitmap& rBmp ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed + bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed virtual void DataChanged( const DataChangedEvent& rDCEvt ); void UpdateEntries( long nOldWidth ); @@ -338,8 +338,8 @@ public: virtual sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const; sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const; - void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, sal_Bool bSelect = sal_True ); + void SelectEntry( const OUString& rStr, bool bSelect = true ) { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, bool bSelect = true ); sal_uInt16 GetSelectEntryStyle( sal_Int32 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr) const { @@ -409,7 +409,7 @@ class SVT_DLLPUBLIC FontNameBox : public ComboBox { private: ImplFontList* mpFontList; - sal_Bool mbWYSIWYG; + bool mbWYSIWYG; OUString maFontMRUEntriesFile; SVT_DLLPRIVATE void ImplCalcUserItemSize(); @@ -427,8 +427,8 @@ public: void Fill( const FontList* pList ); - void EnableWYSIWYG( sal_Bool bEnable = sal_True ); - sal_Bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } + void EnableWYSIWYG( bool bEnable = true ); + bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } private: void InitFontMRUEntriesFile(); @@ -489,7 +489,7 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox short nPtRelMin; short nPtRelMax; short nPtRelStep; - sal_Bool bRelativeMode:1, + bool bRelativeMode:1, bRelative:1, bPtRelative:1, bStdSize:1; @@ -513,12 +513,12 @@ public: sal_uInt16 nStep = 5 ); void EnablePtRelativeMode( short nMin = -200, short nMax = 200, short nStep = 10 ); - sal_Bool IsRelativeMode() const { return bRelativeMode; } - void SetRelative( sal_Bool bRelative = sal_False ); - sal_Bool IsRelative() const { return bRelative; } - void SetPtRelative( sal_Bool bPtRel = sal_True ) - { bPtRelative = bPtRel; SetRelative( sal_True ); } - sal_Bool IsPtRelative() const { return bPtRelative; } + bool IsRelativeMode() const { return bRelativeMode; } + void SetRelative( bool bRelative = false ); + bool IsRelative() const { return bRelative; } + void SetPtRelative( bool bPtRel = true ) + { bPtRelative = bPtRel; SetRelative( true ); } + bool IsPtRelative() const { return bPtRelative; } virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual void SetValue( sal_Int64 nNewValue ); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 0c830f3c121a..dd44b5066eb9 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -53,7 +53,7 @@ class FontNameMenu, class FontSizeMenu -------------------------------------------------------------------------- FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - sal_Bool bAll = sal_True ); + bool bAll = true ); Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, @@ -163,13 +163,13 @@ private: SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const OUString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const OUString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll, - sal_Bool bInsertData ); + SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, bool bAll, + bool bInsertData ); public: FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - sal_Bool bAll = sal_True ); + bool bAll = true ); ~FontList(); FontList* Clone() const; @@ -191,7 +191,7 @@ public: FontWeight eWeight, FontItalic eItalic ) const; - sal_Bool IsAvailable( const OUString& rName ) const; + bool IsAvailable( const OUString& rName ) const; sal_uInt16 GetFontNameCount() const { return (sal_uInt16)maEntries.size(); @@ -223,8 +223,8 @@ private: public: FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - sal_uLong Count() const { return mnElem; } - sal_Bool IsEmpty() const { return !mnElem; } + sal_uLong Count() const { return mnElem; } + bool IsEmpty() const { return !mnElem; } long Name2Size( const OUString& ) const; OUString Size2Name( long ) const; |