[Libreoffice-commits] .: reportdesign/inc reportdesign/source

[Michael Meeks]

 reportdesign/inc/RptModel.hxx                 |    2 +-
 reportdesign/inc/RptObject.hxx                |    6 +++---
 reportdesign/inc/RptPage.hxx                  |    2 +-
 reportdesign/source/core/sdr/RptModel.cxx     |    2 +-
 reportdesign/source/core/sdr/RptObject.cxx    |   12 ++++++------
 reportdesign/source/core/sdr/RptPage.cxx      |    4 ++--
 reportdesign/source/ui/report/ViewsWindow.cxx |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e4dc86995d11ba3ab52a272c584e72169b06a00f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Oct 5 07:57:50 2010 -0500

    FASTBOOL to bool conversion

diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 5b51b97..0ab65dc 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -70,7 +70,7 @@ public:
     virtual ~OReportModel();
 
     virtual void        SetChanged(sal_Bool bFlg = sal_True);
-    virtual SdrPage*    AllocPage(FASTBOOL bMasterPage);
+    virtual SdrPage*    AllocPage(bool bMasterPage);
     virtual Window*     GetCurDocViewWin();
     virtual SdrPage*    RemovePage(USHORT nPgNum);
     /** returns the numbering type that is used to format page fields in drawing shapes */
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index e37dc21..1c9a025 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -160,7 +160,7 @@ protected:
     virtual void NbcMove( const Size& rSize );
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
-    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+    virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
 
     virtual void SetSnapRectImpl(const Rectangle& _rRect);
     virtual SdrPage* GetImplPage() const;
@@ -203,7 +203,7 @@ protected:
     virtual void NbcMove( const Size& rSize );
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
-    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+    virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
 
     virtual void SetSnapRectImpl(const Rectangle& _rRect);
     virtual SdrPage* GetImplPage() const;
@@ -249,7 +249,7 @@ protected:
     virtual void NbcMove( const Size& rSize );
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
-    virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+    virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
 
     virtual void SetSnapRectImpl(const Rectangle& _rRect);
     virtual SdrPage* GetImplPage() const;
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index ab2fe83..3e6538b 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -63,7 +63,7 @@ public:
 
     OReportPage( OReportModel& rModel
                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
-                ,FASTBOOL bMasterPage=FALSE );
+                ,bool bMasterPage = false );
     
 
     virtual SdrPage* Clone() const;
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 2f78bad..bf42ce8 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -96,7 +96,7 @@ void OReportModel::detachController()
     m_pUndoEnv->Clear(OXUndoEnvironment::Accessor());
 }
 //----------------------------------------------------------------------------
-SdrPage* OReportModel::AllocPage(FASTBOOL /*bMasterPage*/)
+SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
 {
     DBG_CHKTHIS( rpt_OReportModel, 0);
     OSL_ENSURE(0,"Who called me!");
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index be64731..46d4029 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -573,9 +573,9 @@ void OCustomShape::NbcSetLogicRect(const Rectangle& rRect)
     SetPropsFromRect(rRect);
 }
 //----------------------------------------------------------------------------
-FASTBOOL OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
-    FASTBOOL bResult = SdrObjCustomShape::EndCreate(rStat, eCmd);
+    bool bResult = SdrObjCustomShape::EndCreate(rStat, eCmd);
     if ( bResult )
     {
         OReportModel* pRptModel = static_cast<OReportModel*>(GetModel());
@@ -815,10 +815,10 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
 }
 //----------------------------------------------------------------------------
 
-FASTBOOL OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     DBG_CHKTHIS( rpt_OUnoObject,NULL);
-    FASTBOOL bResult = SdrUnoObj::EndCreate(rStat, eCmd);
+    bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
     if ( bResult )
     {
         impl_setReportComponent_nothrow();
@@ -1089,10 +1089,10 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
 }
 //----------------------------------------------------------------------------
 
-FASTBOOL OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     DBG_CHKTHIS( rpt_OOle2Obj,NULL);
-    FASTBOOL bResult = SdrOle2Obj::EndCreate(rStat, eCmd);
+    bool bResult = SdrOle2Obj::EndCreate(rStat, eCmd);
     if ( bResult )
     {
         OReportModel* pRptModel = static_cast<OReportModel*>(GetModel());
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 2cf8045..f0d6072 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -41,13 +41,13 @@ TYPEINIT1( OReportPage, SdrPage );
 DBG_NAME( rpt_OReportPage )
 OReportPage::OReportPage( OReportModel& _rModel
                          ,const uno::Reference< report::XSection >& _xSection
-                         ,FASTBOOL bMasterPage )
+                         ,bool bMasterPage )
     :SdrPage( _rModel, bMasterPage )
     ,rModel(_rModel)
     ,m_xSection(_xSection)
      ,m_bSpecialInsertMode(false)
 {
-    DBG_CTOR( rpt_OReportPage,NULL);	
+    DBG_CTOR( rpt_OReportPage,NULL);
 }
 
 //----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 26a90a3..f5e6c18 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1709,7 +1709,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
 
                     if ( rView.IsDragObj() )
                     {
-                        const FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
+                        const bool bWasNoSnap = rDragStat.IsNoSnap();
                         const BOOL bWasSnapEnabled = rView.IsSnapEnabled();
 
                         // switch snapping off