From 5cde8534e96dc7af8a8b6ab243df488c88756e09 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 5 Oct 2010 07:57:50 -0500 Subject: [PATCH] FASTBOOL to bool conversion --- sc/inc/drwlayer.hxx | 2 +- sc/source/core/data/drwlayer.cxx | 4 ++-- sc/source/filter/excel/xiescher.cxx | 6 +++--- sc/source/filter/inc/xiescher.hxx | 2 +- sc/source/ui/drawfunc/fudraw.cxx | 2 +- sc/source/ui/inc/drawview.hxx | 2 +- sc/source/ui/inc/tabvwsh.hxx | 4 ++-- sc/source/ui/view/drawview.cxx | 2 +- sc/source/ui/view/printfun.cxx | 6 +++--- sc/source/ui/view/tabvwsh4.cxx | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 0d76cfa..e4ee412 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -118,7 +118,7 @@ public: ScDrawLayer( ScDocument* pDocument, const String& rName ); virtual ~ScDrawLayer(); - virtual SdrPage* AllocPage(FASTBOOL bMasterPage); + virtual SdrPage* AllocPage(bool bMasterPage); virtual SdrModel* AllocModel() const; virtual void SetChanged( sal_Bool bFlg = sal_True ); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 6c154f6..4aa0b10 100755 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -336,11 +336,11 @@ void ScDrawLayer::UseHyphenator() } } -SdrPage* __EXPORT ScDrawLayer::AllocPage(FASTBOOL bMasterPage) +SdrPage* __EXPORT ScDrawLayer::AllocPage(bool bMasterPage) { // don't create basic until it is needed StarBASIC* pBasic = NULL; - ScDrawPage* pPage = new ScDrawPage( *this, pBasic, sal::static_int_cast(bMasterPage) ); + ScDrawPage* pPage = new ScDrawPage( *this, pBasic, bMasterPage); return pPage; } diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 8040176..b494ed6 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3062,15 +3062,15 @@ XclImpSimpleDffConverter::~XclImpSimpleDffConverter() { } -FASTBOOL XclImpSimpleDffConverter::GetColorFromPalette( USHORT nIndex, Color& rColor ) const +int XclImpSimpleDffConverter::GetColorFromPalette( USHORT nIndex, Color& rColor ) const { ColorData nColor = GetPalette().GetColorData( static_cast< sal_uInt16 >( nIndex ) ); if( nColor == COL_AUTO ) - return FALSE; + return 0; rColor.SetColor( nColor ); - return TRUE; + return 1; } // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 2d1ae84..33186cc 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -971,7 +971,7 @@ public: protected: /** Returns a color from the Excel color palette. */ - virtual FASTBOOL GetColorFromPalette( USHORT nIndex, Color& rColor ) const; + virtual int GetColorFromPalette( USHORT nIndex, Color& rColor ) const; }; // ---------------------------------------------------------------------------- diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 4cbd08d..6c6aea5 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -583,7 +583,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if(pView->IsDragObj()) { - FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); + bool bWasNoSnap = rDragStat.IsNoSnap(); BOOL bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 918dcab..cdd90f1 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -114,7 +114,7 @@ public: bool HasMarkedControl() const; bool HasMarkedInternal() const; - FASTBOOL InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0); + bool InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0); /** Returns the selected object, if it is the caption object of a cell note. @param ppCaptData (out-param) If not null, returns the pointer to the caption object data. */ diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index ad578fa..443f12c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -202,7 +202,7 @@ protected: virtual void Deactivate(BOOL bMDI); virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void ShowCursor(FASTBOOL bOn); + virtual void ShowCursor(bool bOn); virtual void Move(); // Benachrichtigung @@ -227,7 +227,7 @@ protected: virtual void UIDeactivated( SfxInPlaceClient* pClient ); - virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent ); + virtual bool KeyInput( const KeyEvent &rKeyEvent ); virtual SdrView* GetDrawView() const; public: diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 59e1375..be45182 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -696,7 +696,7 @@ BOOL ScDrawView::SelectObject( const String& rName ) } -FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) +bool ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { // Markierung nicht aendern, wenn Ole-Objekt aktiv // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 2cc90d6..1d92e45 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1146,7 +1146,7 @@ void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, const Rectangle &rGrf, const Rectangle &rOut ) { - const FASTBOOL bNotInside = !rOut.IsInside( rGrf ); + const bool bNotInside = !rOut.IsInside( rGrf ); if ( bNotInside ) { pOut->Push(); @@ -1181,8 +1181,8 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi Point aPos; Size aDrawSize = aGrfSize; - FASTBOOL bDraw = TRUE; -// FASTBOOL bRetouche = TRUE; + bool bDraw = TRUE; +// bool bRetouche = TRUE; switch ( ePos ) { case GPOS_LT: aPos = rOrg.TopLeft(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 7cc4379..05cfd00 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -540,7 +540,7 @@ void __EXPORT ScTabViewShell::Move() //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::ShowCursor(FASTBOOL /* bOn */) +void __EXPORT ScTabViewShell::ShowCursor(bool /* bOn */) { /*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden @@ -1606,7 +1606,7 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) return sal::static_int_cast(SfxViewShell::KeyInput( rKeyEvent )); } -FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) +bool __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) { // return SfxViewShell::KeyInput( rKeyEvent ); return TabKeyInput( rKeyEvent ); -- 1.7.1