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 | |
| parent | 1a1fe47731bed27e974094a86b16f91e768c6dc0 (diff) | |
svtools: sal_Bool->bool
Change-Id: Iaa489318f25107e91fc8133523fbd9d724493314
23 files changed, 348 insertions, 348 deletions
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 41bd02c3dcbb..8ad08cc8cd09 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -202,7 +202,7 @@ FontList* ViewElementListProvider::getFontList() const OutputDevice* pDefaultOut = Application::GetDefaultDevice(); m_pFontList = new FontList( pRefDev ? pRefDev : pDefaultOut , pRefDev ? pDefaultOut : NULL - , sal_False ); + , false ); } return m_pFontList; } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index bc9d81bd7dc4..2fe85a47ad7d 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -353,7 +353,7 @@ void SAL_CALL OApplicationController::disposing() { getContainer()->showPreview(NULL); m_pClipbordNotifier->ClearCallbackLink(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_False ); + m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); m_pClipbordNotifier = NULL; } @@ -463,7 +463,7 @@ sal_Bool OApplicationController::Construct(Window* _pParent) m_pClipbordNotifier = new TransferableClipboardListener( LINK( this, OApplicationController, OnClipboardChanged ) ); m_pClipbordNotifier->acquire(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_True ); + m_pClipbordNotifier->AddRemoveListener( getView(), true ); OApplicationController_CBASE::Construct( _pParent ); getView()->Show(); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index b52472d1c205..e47056eb99b1 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -788,7 +788,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) m_pClipbordNotifier = new TransferableClipboardListener( LINK( this, SbaXDataBrowserController, OnClipboardChanged ) ); m_pClipbordNotifier->acquire(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_True ); + m_pClipbordNotifier->AddRemoveListener( getView(), true ); // this call create the toolbox SbaXDataBrowserController_Base::Construct(pParent); @@ -1224,7 +1224,7 @@ void SbaXDataBrowserController::disposing() if ( getView() && m_pClipbordNotifier ) { m_pClipbordNotifier->ClearCallbackLink(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_False ); + m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); m_pClipbordNotifier = NULL; } diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 1ccb9481a3cc..c4397839e5d3 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -143,7 +143,7 @@ namespace frm { m_pClipListener = new TransferableClipboardListener( LINK( this, OPasteClipboardDispatcher, OnClipboardChanged ) ); m_pClipListener->acquire(); - m_pClipListener->AddRemoveListener( _rView.GetWindow(), sal_True ); + m_pClipListener->AddRemoveListener( _rView.GetWindow(), true ); // initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( _rView.GetWindow() ) ); @@ -179,7 +179,7 @@ namespace frm if (m_pClipListener) { if (getEditView() && getEditView()->GetWindow()) - m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), sal_False ); + m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), false ); m_pClipListener->release(); m_pClipListener = NULL; 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; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 60c759ca33d4..0c4f878e369e 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -321,7 +321,7 @@ void OReportController::disposing() if ( m_pClipbordNotifier ) { m_pClipbordNotifier->ClearCallbackLink(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_False ); + m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); m_pClipbordNotifier = NULL; } @@ -1799,7 +1799,7 @@ sal_Bool OReportController::Construct(Window* pParent) m_aSystemClipboard.StartClipboardListening( ); m_pClipbordNotifier = new TransferableClipboardListener( LINK( this, OReportController, OnClipboardChanged ) ); m_pClipbordNotifier->acquire(); - m_pClipbordNotifier->AddRemoveListener( getView(), sal_True ); + m_pClipbordNotifier->AddRemoveListener( getView(), true ); OReportController_BASE::Construct(pParent); return sal_True; diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 1bb6833a9fcd..6085d42134ac 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -504,7 +504,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScDrawTextObjectBar, ClipboardChanged ) ); pClipEvtLstnr->acquire(); Window* pWin = pViewData->GetActiveWin(); - pClipEvtLstnr->AddRemoveListener( pWin, sal_True ); + pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 3cd823c540ff..253cf2c26045 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -506,7 +506,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet ) pImpl->m_pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScCellShell, ClipboardChanged ) ); pImpl->m_pClipEvtLstnr->acquire(); Window* pWin = GetViewData()->GetActiveWin(); - pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, sal_True ); + pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 00928e562577..f3131d440021 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -787,7 +787,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet ) pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScEditShell, ClipboardChanged ) ); pClipEvtLstnr->acquire(); Window* pWin = pViewData->GetActiveWin(); - pClipEvtLstnr->AddRemoveListener( pWin, sal_True ); + pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 8c714a2faeea..77c2df212c7d 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -308,7 +308,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const if(!pFontList) { - pFontList = new FontList( Application::GetDefaultDevice(), NULL, sal_False ); + pFontList = new FontList( Application::GetDefaultDevice(), NULL, false ); bMustDelete = true; } diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1a4296ad9d50..f929483077cc 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -165,7 +165,7 @@ void DrawDocShell::UpdateFontList() pRefDevice = GetPrinter(sal_True); else pRefDevice = SD_MOD()->GetVirtualRefDevice(); - mpFontList = new FontList( pRefDevice, NULL, sal_False ); + mpFontList = new FontList( pRefDevice, NULL, false ); SvxFontListItem aFontListItem( mpFontList, SID_ATTR_CHAR_FONTLIST ); PutItem( aFontListItem ); } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 94c6920e0242..651a37774bcc 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -615,7 +615,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // create listener mpClipEvtLstnr = new TransferableClipboardListener( LINK( this, DrawViewShell, ClipboardChanged ) ); mpClipEvtLstnr->acquire(); - mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_True ); + mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), true ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) ); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index d981d7a55a8c..67dcbcc70e98 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -189,7 +189,7 @@ DrawViewShell::~DrawViewShell() if ( mpClipEvtLstnr ) { - mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False ); + mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), false ); mpClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is waiting mpClipEvtLstnr->release(); } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index c3b780d7cc59..b2ec1f994deb 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -233,7 +233,7 @@ OutlineViewShell::~OutlineViewShell() if ( pClipEvtLstnr ) { - pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_False ); + pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), false ); pClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is waiting pClipEvtLstnr->release(); } @@ -937,7 +937,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, OutlineViewShell, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), sal_True ); + pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), true ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( GetActiveWindow() ) ); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 662733d66ad6..8337d5c6ee11 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -63,15 +63,15 @@ ColorConfig_Impl* ColorConfig::m_pImpl = NULL; class ColorConfig_Impl : public utl::ConfigItem { - ColorConfigValue m_aConfigValues[ColorConfigEntryCount]; - sal_Bool m_bEditMode; - OUString m_sIsVisible; - OUString m_sLoadedScheme; - bool m_bAutoDetectSystemHC; + ColorConfigValue m_aConfigValues[ColorConfigEntryCount]; + bool m_bEditMode; + OUString m_sIsVisible; + OUString m_sLoadedScheme; + bool m_bAutoDetectSystemHC; uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); public: - ColorConfig_Impl(sal_Bool bEditMode = sal_False); + ColorConfig_Impl(bool bEditMode = false); virtual ~ColorConfig_Impl(); void Load(const OUString& rScheme); @@ -90,8 +90,8 @@ public: uno::Sequence< OUString> GetSchemeNames(); - sal_Bool AddScheme(const OUString& rNode); - sal_Bool RemoveScheme(const OUString& rNode); + bool AddScheme(const OUString& rNode); + bool RemoveScheme(const OUString& rNode); void SetModified(){ConfigItem::SetModified();} void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); @@ -112,56 +112,56 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const OUString& rSch const sal_Char* cName; sal_Int32 nLength; rtl_TextEncoding eEncoding; - sal_Bool bCanBeVisible; + bool bCanBeVisible; }; static const ColorConfigEntryData_Impl cNames[] = { - { RTL_CONSTASCII_USTRINGPARAM("/DocColor") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/DocBoundaries") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/AppBackground") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/ObjectBoundaries"),sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/TableBoundaries") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/FontColor") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/Links") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/LinksVisited") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/Spell") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SmartTags") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/Shadow") , sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterTextGrid") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterDirectCursor") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterScriptIndicator") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterSectionBoundaries") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterHeaderFooterMark") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/WriterPageBreaks") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/HTMLSGML") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/HTMLComment") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/HTMLKeyword") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/HTMLUnknown") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcGrid") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreak"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakManual"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakAutomatic"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcDetective") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcDetectiveError") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcReference") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/DrawGrid") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICComment") , sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICNumber") , sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICString") , sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICOperator") , sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICKeyword") , sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/BASICError"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLIdentifier"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLNumber"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLString"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLOperator"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLKeyword"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLParameter"), sal_False }, - { RTL_CONSTASCII_USTRINGPARAM("/SQLComment"), sal_False } + { RTL_CONSTASCII_USTRINGPARAM("/DocColor") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/DocBoundaries") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/AppBackground") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/ObjectBoundaries"),true }, + { RTL_CONSTASCII_USTRINGPARAM("/TableBoundaries") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/FontColor") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/Links") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/LinksVisited") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/Spell") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/SmartTags") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/Shadow") , true }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterTextGrid") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterFieldShadings"),true }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterIdxShadings") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterDirectCursor") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterScriptIndicator") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterSectionBoundaries") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterHeaderFooterMark") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/WriterPageBreaks") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/HTMLSGML") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/HTMLComment") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/HTMLKeyword") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/HTMLUnknown") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcGrid") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreak"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakManual"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcPageBreakAutomatic"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcDetective") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcDetectiveError") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcReference") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/CalcNotesBackground") ,false }, + { RTL_CONSTASCII_USTRINGPARAM("/DrawGrid") ,true }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICIdentifier"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICComment") , false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICNumber") , false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICString") , false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICOperator") , false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICKeyword") , false }, + { RTL_CONSTASCII_USTRINGPARAM("/BASICError"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLIdentifier"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLNumber"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLString"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLOperator"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLKeyword"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLParameter"), false }, + { RTL_CONSTASCII_USTRINGPARAM("/SQLComment"), false } }; int nIndex = 0; OUString sColor = cColor; @@ -185,7 +185,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const OUString& rSch return aNames; } -ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) : +ColorConfig_Impl::ColorConfig_Impl(bool bEditMode) : ConfigItem("Office.UI/ColorScheme"), m_bEditMode(bEditMode), m_sIsVisible("/IsVisible"), @@ -317,18 +317,18 @@ uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames() return GetNodeNames("ColorSchemes"); } -sal_Bool ColorConfig_Impl::AddScheme(const OUString& rScheme) +bool ColorConfig_Impl::AddScheme(const OUString& rScheme) { if(ConfigItem::AddNode("ColorSchemes", rScheme)) { m_sLoadedScheme = rScheme; Commit(); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme) +bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme) { uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; @@ -499,7 +499,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry) return aRet; } -ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart)const +ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, bool bSmart) const { ColorConfigValue aRet = m_pImpl->GetColorConfigValue(eEntry); if(bSmart) @@ -518,7 +518,7 @@ void ColorConfig::Reload() EditableColorConfig::EditableColorConfig() : m_pImpl(new ColorConfig_Impl), - m_bModified(sal_False) + m_bModified(false) { m_pImpl->BlockBroadcasts(true); } @@ -548,17 +548,17 @@ void EditableColorConfig::AddScheme(const OUString& rScheme ) m_pImpl->AddScheme(rScheme); } -sal_Bool EditableColorConfig::LoadScheme(const OUString& rScheme ) +bool EditableColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); if(m_pImpl->IsModified()) m_pImpl->Commit(); - m_bModified = sal_False; + m_bModified = false; m_pImpl->Load(rScheme); //the name of the loaded scheme has to be committed separately m_pImpl->CommitCurrentSchemeName(); - return sal_True; + return true; } const OUString& EditableColorConfig::GetCurrentSchemeName()const @@ -584,12 +584,12 @@ void EditableColorConfig::SetColorValue( { m_pImpl->SetColorConfigValue(eEntry, rValue); m_pImpl->ClearModified(); - m_bModified = sal_True; + m_bModified = true; } void EditableColorConfig::SetModified() { - m_bModified = sal_True; + m_bModified = true; } void EditableColorConfig::Commit() @@ -598,7 +598,7 @@ void EditableColorConfig::Commit() m_pImpl->SetModified(); if(m_pImpl->IsModified()) m_pImpl->Commit(); - m_bModified = sal_False; + m_bModified = false; } void EditableColorConfig::DisableBroadcast() diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index c6a9fffc7615..fcb6f9c781d4 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star; -static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, sal_Bool bSelect ) +static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, bool bSelect ) { if ( bSelect ) pTable->insert( rDate.GetDate() ); @@ -77,7 +77,7 @@ static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, sal_B static void ImplCalendarSelectDateRange( IntDateSet* pTable, const Date& rStartDate, const Date& rEndDate, - sal_Bool bSelect ) + bool bSelect ) { Date aStartDate = rStartDate; Date aEndDate = rEndDate; @@ -172,24 +172,24 @@ void Calendar::ImplInit( WinBits nWinStyle ) mnFirstYear = 0; mnLastYear = 0; mnRequestYear = 0; - mbCalc = sal_True; - mbFormat = sal_True; - mbDrag = sal_False; - mbSelection = sal_False; - mbMultiSelection = sal_False; - mbWeekSel = sal_False; - mbUnSel = sal_False; - mbMenuDown = sal_False; - mbSpinDown = sal_False; - mbPrevIn = sal_False; - mbNextIn = sal_False; - mbDirect = sal_False; - mbInSelChange = sal_False; - mbTravelSelect = sal_False; - mbScrollDateRange = sal_False; - mbSelLeft = sal_False; - mbAllSel = sal_False; - mbDropPos = sal_False; + mbCalc = true; + mbFormat = true; + mbDrag = false; + mbSelection = false; + mbMultiSelection = false; + mbWeekSel = false; + mbUnSel = false; + mbMenuDown = false; + mbSpinDown = false; + mbPrevIn = false; + mbNextIn = false; + mbDirect = false; + mbInSelChange = false; + mbTravelSelect = false; + mbScrollDateRange = false; + mbSelLeft = false; + mbAllSel = false; + mbDropPos = false; OUString aGregorian( "gregorian"); maCalendarWrapper.loadCalendar( aGregorian, @@ -208,7 +208,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) } SetFirstDate( maCurDate ); - ImplCalendarSelectDate( mpSelectTable, maCurDate, sal_True ); + ImplCalendarSelectDate( mpSelectTable, maCurDate, true ); // Sonstige Strings erzeugen maDayText = SVT_RESSTR(STR_SVT_CALENDAR_DAY); @@ -420,7 +420,7 @@ void Calendar::ImplFormat() nDay %= 7; } - mbCalc = sal_False; + mbCalc = false; } // calculate number of days @@ -491,7 +491,7 @@ void Calendar::ImplFormat() } mnRequestYear = 0; - mbFormat = sal_False; + mbFormat = false; } @@ -628,7 +628,7 @@ sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect, - sal_Bool bPrev ) + bool bPrev ) { long i; long n; @@ -673,7 +673,7 @@ static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect, -void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) +void Calendar::ImplDrawSpin( bool bDrawPrev, bool bDrawNext ) { if ( !bDrawPrev && !bDrawNext ) return; @@ -687,7 +687,7 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) aOutRect.Top() += 3; aOutRect.Right() -= 3; aOutRect.Bottom() -= 3; - ImplDrawSpinArrow( this, aOutRect, sal_True ); + ImplDrawSpinArrow( this, aOutRect, true ); } if ( bDrawNext ) { @@ -696,7 +696,7 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) aOutRect.Top() += 3; aOutRect.Right() -= 3; aOutRect.Bottom() -= 3; - ImplDrawSpinArrow( this, aOutRect, sal_False ); + ImplDrawSpinArrow( this, aOutRect, false ); } } @@ -705,23 +705,23 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) void Calendar::ImplDrawDate( long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, - sal_Bool bBack, sal_Bool bOther, sal_uLong nToday ) + bool bBack, bool bOther, sal_uLong nToday ) { Color* pTextColor = NULL; const OUString& rDay = maDayTexts[nDay-1]; Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 ); - sal_Bool bSel = sal_False; - sal_Bool bFocus = sal_False; + bool bSel = false; + bool bFocus = false; // actual day if ( (nDay == maCurDate.GetDay()) && (nMonth == maCurDate.GetMonth()) && (nYear == maCurDate.GetYear()) ) - bFocus = sal_True; + bFocus = true; if ( mpSelectTable ) { if ( mpSelectTable->find( Date( nDay, nMonth, nYear ).GetDate() ) != mpSelectTable->end() ) - bSel = sal_True; + bSel = true; } // get textcolour @@ -744,7 +744,7 @@ void Calendar::ImplDrawDate( long nX, long nY, // get font Font aOldFont = GetFont(); - sal_Bool bBoldFont = sal_False; + bool bBoldFont = false; // display background const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -801,7 +801,7 @@ void Calendar::ImplDrawDate( long nX, long nY, -void Calendar::ImplDraw( sal_Bool bPaint ) +void Calendar::ImplDraw( bool bPaint ) { ImplFormat(); @@ -989,7 +989,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) nDeltaX = nDayX + (nDay*mnDayWidth); ImplDrawDate( nDeltaX, nDayY, nDay+aTempDate.GetDay(), aTempDate.GetMonth(), aTempDate.GetYear(), - (DayOfWeek)((nDay+(sal_uInt16)eStartDay)%7), sal_False, sal_True, nToday ); + (DayOfWeek)((nDay+(sal_uInt16)eStartDay)%7), false, true, nToday ); } } for ( nDay = 1; nDay <= nDaysInMonth; nDay++ ) @@ -997,7 +997,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) nDeltaX = nDayX + (nDayIndex*mnDayWidth); ImplDrawDate( nDeltaX, nDayY, nDay, nMonth, nYear, (DayOfWeek)((nDayIndex+(sal_uInt16)eStartDay)%7), - sal_False, sal_False, nToday ); + false, false, nToday ); if ( nDayIndex == 6 ) { nDayIndex = 0; @@ -1019,7 +1019,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) ImplDrawDate( nDeltaX, nDayY, nDay, aTempDate.GetMonth(), aTempDate.GetYear(), (DayOfWeek)((nDayIndex+(sal_uInt16)eStartDay)%7), - sal_False, sal_True, nToday ); + false, true, nToday ); if ( nDayIndex == 6 ) { nDayIndex = 0; @@ -1051,10 +1051,10 @@ void Calendar::ImplUpdateDate( const Date& rDate ) Rectangle aDateRect( GetDateRect( rDate ) ); if ( !aDateRect.IsEmpty() ) { - sal_Bool bOther = (rDate < GetFirstMonth()) || (rDate > GetLastMonth()); + bool bOther = (rDate < GetFirstMonth()) || (rDate > GetLastMonth()); ImplDrawDate( aDateRect.Left(), aDateRect.Top(), rDate.GetDay(), rDate.GetMonth(), rDate.GetYear(), - rDate.GetDayOfWeek(), sal_True, bOther ); + rDate.GetDayOfWeek(), true, bOther ); } } } @@ -1089,7 +1089,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld ) void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, - sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended ) + bool bMove, bool bExpand, bool bExtended ) { IntDateSet* pOldSel = new IntDateSet( *mpSelectTable ); Date aOldDate = maCurDate; @@ -1125,35 +1125,35 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, { if ( mbSelLeft ) { - ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), aTempDate, sal_False ); - ImplCalendarSelectDateRange( mpSelectTable, maAnchorDate, Date( 31, 12, 9999 ), sal_False ); + ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), aTempDate, false ); + ImplCalendarSelectDateRange( mpSelectTable, maAnchorDate, Date( 31, 12, 9999 ), false ); } else { - ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), maAnchorDate, sal_False ); - ImplCalendarSelectDateRange( mpSelectTable, aTempDate, Date( 31, 12, 9999 ), sal_False ); + ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), maAnchorDate, false ); + ImplCalendarSelectDateRange( mpSelectTable, aTempDate, Date( 31, 12, 9999 ), false ); } } - ImplCalendarSelectDateRange( mpSelectTable, aTempDate, maAnchorDate, sal_True ); + ImplCalendarSelectDateRange( mpSelectTable, aTempDate, maAnchorDate, true ); } else if ( bExtended && !(mnWinStyle & WB_RANGESELECT) ) { maAnchorDate = aTempDate; if ( IsDateSelected( aTempDate ) ) { - mbUnSel = sal_True; - ImplCalendarSelectDate( mpSelectTable, aTempDate, sal_False ); + mbUnSel = true; + ImplCalendarSelectDate( mpSelectTable, aTempDate, false ); } else { - ImplCalendarSelectDate( mpSelectTable, aTempDate, sal_True ); + ImplCalendarSelectDate( mpSelectTable, aTempDate, true ); } } else { maAnchorDate = aTempDate; ImplCalendarClearSelectDate( mpSelectTable ); - ImplCalendarSelectDate( mpSelectTable, aTempDate, sal_True ); + ImplCalendarSelectDate( mpSelectTable, aTempDate, true ); } mpRestoreSelectTable = new IntDateSet( *mpSelectTable ); @@ -1162,9 +1162,9 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, else { if ( aTempDate < maCurDate ) - mbSelLeft = sal_True; + mbSelLeft = true; else - mbSelLeft = sal_False; + mbSelLeft = false; if ( !(nHitTest & CALENDAR_HITTEST_DAY) ) aTempDate = maOldCurDate; if ( !bMove ) @@ -1172,19 +1172,19 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, if ( aTempDate != maCurDate ) { maCurDate = aTempDate; - ImplCalendarSelectDate( mpSelectTable, aOldDate, sal_False ); - ImplCalendarSelectDate( mpSelectTable, maCurDate, sal_True ); + ImplCalendarSelectDate( mpSelectTable, aOldDate, false ); + ImplCalendarSelectDate( mpSelectTable, maCurDate, true ); } } - sal_Bool bNewSel = *pOldSel != *mpSelectTable; + bool bNewSel = *pOldSel != *mpSelectTable; if ( (maCurDate != aOldDate) || bNewSel ) { if ( bNewSel ) { - mbInSelChange = sal_True; + mbInSelChange = true; SelectionChanging(); - mbInSelChange = sal_False; + mbInSelChange = false; } HideFocus(); if ( bNewSel ) @@ -1201,7 +1201,7 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, -void Calendar::ImplUpdate( sal_Bool bCalcNew ) +void Calendar::ImplUpdate( bool bCalcNew ) { if ( IsReallyVisible() && IsUpdateMode() ) { @@ -1211,8 +1211,8 @@ void Calendar::ImplUpdate( sal_Bool bCalcNew ) { if ( mbDirect ) { - mbFormat = sal_True; - ImplDraw( sal_False ); + mbFormat = true; + ImplDraw( false ); return; } else @@ -1221,8 +1221,8 @@ void Calendar::ImplUpdate( sal_Bool bCalcNew ) } if ( bCalcNew ) - mbCalc = sal_True; - mbFormat = sal_True; + mbCalc = true; + mbFormat = true; } @@ -1237,7 +1237,7 @@ void Calendar::ImplInvertDropPos() -void Calendar::ImplScroll( sal_Bool bPrev ) +void Calendar::ImplScroll( bool bPrev ) { Date aNewFirstMonth = GetFirstMonth(); if ( bPrev ) @@ -1247,9 +1247,9 @@ void Calendar::ImplScroll( sal_Bool bPrev ) } else aNewFirstMonth += aNewFirstMonth.GetDaysInMonth(); - mbDirect = sal_True; + mbDirect = true; SetFirstDate( aNewFirstMonth ); - mbDirect = sal_False; + mbDirect = false; } @@ -1287,9 +1287,9 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) nYearIdCount += 1000; } - mbMenuDown = sal_True; + mbMenuDown = true; nCurItemId = aPopupMenu.Execute( this, rPos ); - mbMenuDown = sal_False; + mbMenuDown = false; // destroy menu aPopupMenu.SetPopupMenu( 2, NULL ); @@ -1319,7 +1319,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) -void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat ) +void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) { Date aTempDate = maCurDate; sal_uInt16 nHitTest = ImplHitTest( rPos, aTempDate ); @@ -1331,29 +1331,29 @@ void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat ) if ( bRepeat && (mbPrevIn || mbNextIn) ) { - mbScrollDateRange = sal_True; + mbScrollDateRange = true; ImplScroll( mbPrevIn ); - mbScrollDateRange = sal_False; + mbScrollDateRange = false; } } else - ImplMouseSelect( aTempDate, nHitTest, sal_True, sal_False, sal_False ); + ImplMouseSelect( aTempDate, nHitTest, true, false, false ); } -void Calendar::ImplEndTracking( sal_Bool bCancel ) +void Calendar::ImplEndTracking( bool bCancel ) { - sal_Bool bSelection = mbSelection; - sal_Bool bSpinDown = mbSpinDown; + bool bSelection = mbSelection; + bool bSpinDown = mbSpinDown; - mbDrag = sal_False; - mbSelection = sal_False; - mbMultiSelection = sal_False; - mbUnSel = sal_False; - mbSpinDown = sal_False; - mbPrevIn = sal_False; - mbNextIn = sal_False; + mbDrag = false; + mbSelection = false; + mbMultiSelection = false; + mbUnSel = false; + mbSpinDown = false; + mbPrevIn = false; + mbNextIn = false; if ( bCancel ) { @@ -1388,9 +1388,9 @@ void Calendar::ImplEndTracking( sal_Bool bCancel ) Date aFirstSelDate( *mpSelectTable->begin() ); Date aLastSelDate( *mpSelectTable->rbegin() ); if ( aLastSelDate < GetFirstMonth() ) - ImplScroll( sal_True ); + ImplScroll( true ); else if ( GetLastMonth() < aFirstSelDate ) - ImplScroll( sal_False ); + ImplScroll( false ); } } @@ -1412,13 +1412,13 @@ void Calendar::ImplEndTracking( sal_Bool bCancel ) IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG ) { - sal_Bool bPrevIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0; - sal_Bool bNextIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; + bool bPrevIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0; + bool bNextIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; if( bNextIn || bPrevIn ) { - pThis->mbScrollDateRange = sal_True; + pThis->mbScrollDateRange = true; pThis->ImplScroll( bPrevIn ); - pThis->mbScrollDateRange = sal_False; + pThis->mbScrollDateRange = false; } return 0; } @@ -1443,10 +1443,10 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) mbNextIn = (nHitTest & CALENDAR_HITTEST_NEXT) != 0; if ( mbPrevIn || mbNextIn ) { - mbSpinDown = sal_True; - mbScrollDateRange = sal_True; + mbSpinDown = true; + mbScrollDateRange = true; ImplScroll( mbPrevIn ); - mbScrollDateRange = sal_False; + mbScrollDateRange = false; // it should really read BUTTONREPEAT, therefore do not // change it to SCROLLREPEAT, check with TH, // why it could be different (71775) @@ -1465,16 +1465,16 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) if ( !mbSelection ) { - mbDrag = sal_True; + mbDrag = true; StartTracking(); } mbMultiSelection = (mnWinStyle & (WB_MULTISELECT | WB_RANGESELECT)) != 0; if ( (nHitTest & CALENDAR_HITTEST_DAY) && mbMultiSelection ) - mbWeekSel = sal_True; + mbWeekSel = true; else - mbWeekSel = sal_False; - ImplMouseSelect( aTempDate, nHitTest, sal_False, rMEvt.IsShift(), rMEvt.IsMod1() ); + mbWeekSel = false; + ImplMouseSelect( aTempDate, nHitTest, false, rMEvt.IsShift(), rMEvt.IsMod1() ); } } } @@ -1491,7 +1491,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) void Calendar::MouseButtonUp( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && mbSelection ) - ImplEndTracking( sal_False ); + ImplEndTracking( false ); else Control::MouseButtonUp( rMEvt ); } @@ -1501,7 +1501,7 @@ void Calendar::MouseButtonUp( const MouseEvent& rMEvt ) void Calendar::MouseMove( const MouseEvent& rMEvt ) { if ( mbSelection && rMEvt.GetButtons() ) - ImplTracking( rMEvt.GetPosPixel(), sal_False ); + ImplTracking( rMEvt.GetPosPixel(), false ); else Control::MouseMove( rMEvt ); } @@ -1523,9 +1523,9 @@ void Calendar::Tracking( const TrackingEvent& rTEvt ) void Calendar::KeyInput( const KeyEvent& rKEvt ) { Date aNewDate = maCurDate; - sal_Bool bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0; - sal_Bool bExpand = rKEvt.GetKeyCode().IsShift(); - sal_Bool bExtended = rKEvt.GetKeyCode().IsMod1(); + bool bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0; + bool bExpand = rKEvt.GetKeyCode().IsShift(); + bool bExtended = rKEvt.GetKeyCode().IsMod1(); switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -1570,13 +1570,13 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) { if ( !bExpand ) { - sal_Bool bDateSel = IsDateSelected( maCurDate ); + bool bDateSel = IsDateSelected( maCurDate ); SelectDate( maCurDate, !bDateSel ); - mbSelLeft = sal_False; + mbSelLeft = false; SelectionChanging(); - mbTravelSelect = sal_True; + mbTravelSelect = true; Select(); - mbTravelSelect = sal_False; + mbTravelSelect = false; } } else @@ -1599,23 +1599,23 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) { if ( mbSelLeft ) { - ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), aNewDate, sal_False ); - ImplCalendarSelectDateRange( mpSelectTable, maAnchorDate, Date( 31, 12, 9999 ), sal_False ); + ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), aNewDate, false ); + ImplCalendarSelectDateRange( mpSelectTable, maAnchorDate, Date( 31, 12, 9999 ), false ); } else { - ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), maAnchorDate, sal_False ); - ImplCalendarSelectDateRange( mpSelectTable, aNewDate, Date( 31, 12, 9999 ), sal_False ); + ImplCalendarSelectDateRange( mpSelectTable, Date( 1, 1, 0 ), maAnchorDate, false ); + ImplCalendarSelectDateRange( mpSelectTable, aNewDate, Date( 31, 12, 9999 ), false ); } } - ImplCalendarSelectDateRange( mpSelectTable, aNewDate, maAnchorDate, sal_True ); - mbDirect = sal_True; + ImplCalendarSelectDateRange( mpSelectTable, aNewDate, maAnchorDate, true ); + mbDirect = true; SetCurDate( aNewDate ); - mbDirect = sal_False; + mbDirect = false; maAnchorDate = aOldAnchorDate; - mbInSelChange = sal_True; + mbInSelChange = true; SelectionChanging(); - mbInSelChange = sal_False; + mbInSelChange = false; ImplUpdateSelection( pOldSel ); delete pOldSel; } @@ -1624,15 +1624,15 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) if ( mnWinStyle & WB_RANGESELECT ) { SetNoSelection(); - SelectDate( aNewDate, sal_True ); + SelectDate( aNewDate, true ); } - mbDirect = sal_True; + mbDirect = true; SetCurDate( aNewDate ); - mbDirect = sal_False; + mbDirect = false; } - mbTravelSelect = sal_True; + mbTravelSelect = true; Select(); - mbTravelSelect = sal_False; + mbTravelSelect = false; } } @@ -1640,7 +1640,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) void Calendar::Paint( const Rectangle& ) { - ImplDraw( sal_True ); + ImplDraw( true ); } @@ -1663,7 +1663,7 @@ void Calendar::LoseFocus() void Calendar::Resize() { - ImplUpdate( sal_True ); + ImplUpdate( true ); Control::Resize(); } @@ -1743,7 +1743,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) { while ( nNotchDelta < 0 ) { - ImplScroll( sal_True ); + ImplScroll( true ); nNotchDelta++; } } @@ -1751,7 +1751,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) { while ( nNotchDelta > 0 ) { - ImplScroll( sal_False ); + ImplScroll( false ); nNotchDelta--; } } @@ -1826,7 +1826,7 @@ void Calendar::Select() -void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect ) +void Calendar::SelectDate( const Date& rDate, bool bSelect ) { if ( !rDate.IsValidAndGregorian() ) return; @@ -1869,7 +1869,7 @@ void Calendar::SetNoSelection() -sal_Bool Calendar::IsDateSelected( const Date& rDate ) const +bool Calendar::IsDateSelected( const Date& rDate ) const { return mpSelectTable->find( rDate.GetDate() ) != mpSelectTable->end(); } @@ -1896,18 +1896,18 @@ void Calendar::SetCurDate( const Date& rNewDate ) if ( maCurDate != rNewDate ) { - sal_Bool bUpdate = IsVisible() && IsUpdateMode(); + bool bUpdate = IsVisible() && IsUpdateMode(); Date aOldDate = maCurDate; maCurDate = rNewDate; maAnchorDate = maCurDate; if ( !(mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) ) { - ImplCalendarSelectDate( mpSelectTable, aOldDate, sal_False ); - ImplCalendarSelectDate( mpSelectTable, maCurDate, sal_True ); + ImplCalendarSelectDate( mpSelectTable, aOldDate, false ); + ImplCalendarSelectDate( mpSelectTable, maCurDate, true ); } else if ( !HasFocus() ) - bUpdate = sal_False; + bUpdate = false; // shift actual date in the visible area if ( mbFormat || (maCurDate < GetFirstMonth()) ) @@ -1952,7 +1952,7 @@ void Calendar::SetFirstDate( const Date& rNewFirstDate ) if ( maFirstDate != rNewFirstDate ) { maFirstDate = Date( 1, rNewFirstDate.GetMonth(), rNewFirstDate.GetYear() ); - mbDropPos = sal_False; + mbDropPos = false; ImplUpdate(); } } @@ -1996,17 +1996,17 @@ sal_uInt16 Calendar::GetMonthCount() const -sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const +bool Calendar::GetDate( const Point& rPos, Date& rDate ) const { Date aDate = maCurDate; sal_uInt16 nHitTest = ImplHitTest( rPos, aDate ); if ( nHitTest & CALENDAR_HITTEST_DAY ) { rDate = aDate; - return sal_True; + return true; } else - return sal_False; + return false; } @@ -2120,7 +2120,7 @@ void Calendar::StartSelection() maOldCurDate = maCurDate; mpOldSelectTable = new IntDateSet( *mpSelectTable ); - mbSelection = sal_True; + mbSelection = true; } @@ -2132,12 +2132,12 @@ void Calendar::EndSelection() if ( !mbSelection ) ReleaseMouse(); - mbDrag = sal_False; - mbSelection = sal_False; - mbMultiSelection = sal_False; - mbSpinDown = sal_False; - mbPrevIn = sal_False; - mbNextIn = sal_False; + mbDrag = false; + mbSelection = false; + mbMultiSelection = false; + mbSpinDown = false; + mbPrevIn = false; + mbNextIn = false; } } @@ -2218,8 +2218,8 @@ public: void SetCalendar( Calendar* pCalendar ) { mpCalendar = pCalendar; } - PushButton* EnableTodayBtn( sal_Bool bEnable ); - PushButton* EnableNoneBtn( sal_Bool bEnable ); + PushButton* EnableTodayBtn( bool bEnable ); + PushButton* EnableNoneBtn( bool bEnable ); void ArrangeButtons(); virtual bool Notify( NotifyEvent& rNEvt ); @@ -2247,7 +2247,7 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin() -PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable ) +PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable ) { if ( bEnable ) { @@ -2279,7 +2279,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable ) -PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable ) +PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable ) { if ( bEnable ) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index f8ae79d0f956..8082056ca21e 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -74,10 +74,10 @@ class ImplColorListData { public: Color aColor; - sal_Bool bColor; + bool bColor; - ImplColorListData() : aColor( COL_BLACK ) { bColor = sal_False; } - ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = sal_True; } + ImplColorListData() : aColor( COL_BLACK ) { bColor = false; } + ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; } }; @@ -828,7 +828,7 @@ sal_Int32 LineListBox::GetStylePos( sal_Int32 nListPos, long nWidth ) } -void LineListBox::SelectEntry( sal_uInt16 nStyle, sal_Bool bSelect ) +void LineListBox::SelectEntry( sal_uInt16 nStyle, bool bSelect ) { sal_Int32 nPos = GetEntryPos( nStyle ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -921,12 +921,12 @@ sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const -sal_Bool LineListBox::UpdatePaintLineColor( void ) +bool LineListBox::UpdatePaintLineColor( void ) { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); Color aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor ); - sal_Bool bRet = aNewCol != maPaintCol; + bool bRet = aNewCol != maPaintCol; if( bRet ) maPaintCol = aNewCol; @@ -1036,7 +1036,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { mpFontList = NULL; - mbWYSIWYG = sal_False; + mbWYSIWYG = false; InitFontMRUEntriesFile(); } @@ -1176,7 +1176,7 @@ void FontNameBox::Fill( const FontList* pList ) -void FontNameBox::EnableWYSIWYG( sal_Bool bEnable ) +void FontNameBox::EnableWYSIWYG( bool bEnable ) { if ( bEnable != mbWYSIWYG ) { @@ -1530,11 +1530,11 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) FontWeight eLastWeight = WEIGHT_DONTKNOW; FontItalic eLastItalic = ITALIC_NONE; FontWidth eLastWidth = WIDTH_DONTKNOW; - sal_Bool bNormal = sal_False; - sal_Bool bItalic = sal_False; - sal_Bool bBold = sal_False; - sal_Bool bBoldItalic = sal_False; - sal_Bool bInsert = sal_False; + bool bNormal = false; + bool bItalic = false; + bool bBold = false; + bool bBoldItalic = false; + bool bInsert = false; FontInfo aInfo; while ( hFontInfo ) { @@ -1554,16 +1554,16 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) if ( eWeight <= WEIGHT_NORMAL ) { if ( eItalic != ITALIC_NONE ) - bItalic = sal_True; + bItalic = true; else - bNormal = sal_True; + bNormal = true; } else { if ( eItalic != ITALIC_NONE ) - bBoldItalic = sal_True; + bBoldItalic = true; else - bBold = sal_True; + bBold = true; } // For wrong StyleNames we replace this with the correct once @@ -1597,11 +1597,11 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) } if ( !bItalic && (aStyleText == pList->GetItalicStr()) ) - bItalic = sal_True; + bItalic = true; else if ( !bBold && (aStyleText == pList->GetBoldStr()) ) - bBold = sal_True; + bBold = true; else if ( !bBoldItalic && (aStyleText == pList->GetBoldItalicStr()) ) - bBoldItalic = sal_True; + bBoldItalic = true; hFontInfo = pList->GetNextFontInfo( hFontInfo ); } @@ -1686,10 +1686,10 @@ void FontSizeBox::ImplInit() { EnableAutocomplete( false ); - bRelativeMode = sal_False; - bPtRelative = sal_False; - bRelative = sal_False; - bStdSize = sal_False; + bRelativeMode = false; + bPtRelative = false; + bRelative = false; + bStdSize = false; pFontList = NULL; SetShowTrailingZeros( false ); @@ -1727,24 +1727,24 @@ void FontSizeBox::Modify() { OUString aStr = comphelper::string::stripStart(GetText(), ' '); - sal_Bool bNewMode = bRelative; - sal_Bool bOldPtRelMode = bPtRelative; + bool bNewMode = bRelative; + bool bOldPtRelMode = bPtRelative; if ( bRelative ) { - bPtRelative = sal_False; + bPtRelative = false; const sal_Unicode* pStr = aStr.getStr(); while ( *pStr ) { if ( ((*pStr < '0') || (*pStr > '9')) && (*pStr != '%') ) { if ( ('-' == *pStr || '+' == *pStr) && !bPtRelative ) - bPtRelative = sal_True; + bPtRelative = true; else if ( bPtRelative && 'p' == *pStr && 't' == *++pStr ) ; else { - bNewMode = sal_False; + bNewMode = false; break; } } @@ -1755,14 +1755,14 @@ void FontSizeBox::Modify() { if ( -1 != aStr.indexOf('%') ) { - bNewMode = sal_True; - bPtRelative = sal_False; + bNewMode = true; + bPtRelative = false; } if ( '-' == aStr[0] || '+' == aStr[0] ) { - bNewMode = sal_True; - bPtRelative = sal_True; + bNewMode = true; + bPtRelative = true; } } @@ -1803,10 +1803,10 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) // for standard sizes we don't need to bother if ( bStdSize && GetEntryCount() && aFontSizeNames.IsEmpty() ) return; - bStdSize = sal_True; + bStdSize = true; } else - bStdSize = sal_False; + bStdSize = false; Selection aSelection = GetSelection(); OUString aStr = GetText(); @@ -1865,7 +1865,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) { - bRelativeMode = sal_True; + bRelativeMode = true; nRelMin = nMin; nRelMax = nMax; nRelStep = nStep; @@ -1876,7 +1876,7 @@ void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep ) { - bRelativeMode = sal_True; + bRelativeMode = true; nPtRelMin = nMin; nPtRelMax = nMax; nPtRelStep = nStep; @@ -1885,7 +1885,7 @@ void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep ) -void FontSizeBox::SetRelative( sal_Bool bNewRelative ) +void FontSizeBox::SetRelative( bool bNewRelative ) { if ( bRelativeMode ) { @@ -1894,8 +1894,8 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) if ( bNewRelative ) { - bRelative = sal_True; - bStdSize = sal_False; + bRelative = true; + bStdSize = false; if ( bPtRelative ) { @@ -1932,7 +1932,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) } else { - bRelative = bPtRelative = sal_False; + bRelative = bPtRelative = false; SetDecimalDigits( 1 ); SetMin( 20 ); SetMax( 9999 ); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index a51e41fdc208..f0733bd1194e 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -242,8 +242,8 @@ ImplFontListNameInfo* FontList::ImplFindByName(const OUString& rStr) const return ImplFind( aSearchName, NULL ); } -void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, - sal_Bool bInsertData ) +void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll, + bool bInsertData ) { rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding(); @@ -289,7 +289,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, { if ( bInsertData ) { - sal_Bool bInsert = sal_True; + bool bInsert = true; ImplFontListFontInfo* pPrev = NULL; ImplFontListFontInfo* pTemp = pData->mpFirst; ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice ); @@ -310,7 +310,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, pTemp->mpNext = pTemp2; } delete pNewInfo; - bInsert = sal_False; + bInsert = false; } break; @@ -338,7 +338,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, -FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, sal_Bool bAll ) +FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll ) { // initialise variables mpDev = pDevice; @@ -355,14 +355,14 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, sal_Bool bAll maBlack = SVT_RESSTR(STR_SVT_STYLE_BLACK); maBlackItalic = SVT_RESSTR(STR_SVT_STYLE_BLACK_ITALIC); - ImplInsertFonts( pDevice, bAll, sal_True ); + ImplInsertFonts( pDevice, bAll, true ); // if required compare to the screen fonts // in order to map the duplicates to Equal - sal_Bool bCompareWindow = sal_False; + bool bCompareWindow = false; if ( !pDevice2 && (pDevice->GetOutDevType() == OUTDEV_PRINTER) ) { - bCompareWindow = sal_True; + bCompareWindow = true; pDevice2 = Application::GetDefaultDevice(); } @@ -517,8 +517,8 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const const OUString& rStyleName = rInfo.GetStyleName(); if (!rStyleName.isEmpty()) { - sal_Bool bNotSynthetic = sal_False; - sal_Bool bNoneAvailable = sal_False; + bool bNotSynthetic = false; + bool bNoneAvailable = false; FontWeight eWeight = rInfo.GetWeight(); FontItalic eItalic = rInfo.GetItalic(); ImplFontListFontInfo* pFontInfo = pData->mpFirst; @@ -527,7 +527,7 @@ OUString FontList::GetFontMapText( const FontInfo& rInfo ) const if ( (eWeight == pFontInfo->GetWeight()) && (eItalic == pFontInfo->GetItalic()) ) { - bNotSynthetic = sal_True; + bNotSynthetic = true; break; } @@ -715,7 +715,7 @@ FontInfo FontList::Get(const OUString& rName, -sal_Bool FontList::IsAvailable(const OUString& rName) const +bool FontList::IsAvailable(const OUString& rName) const { return (ImplFindByName( rName ) != 0); } diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index e560f7e81dec..4102cd3482c5 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -58,7 +58,7 @@ void SAL_CALL TransferableClipboardListener::changedContents( } } -void TransferableClipboardListener::AddRemoveListener( Window* pWin, sal_Bool bAdd ) +void TransferableClipboardListener::AddRemoveListener( Window* pWin, bool bAdd ) { try { |